rspamd: restart rspamd if configured, not if init.d file is present

jnorell · jnorell · commit bdb8d46ba423 · 2021-04-08T16:41:13.000-06:00
diff --git a/server/plugins-available/rspamd_plugin.inc.php b/server/plugins-available/rspamd_plugin.inc.php
@@ -460,7 +460,7 @@ function spamfilter_wblist_update($event_name, $data) {
 				unlink($wblist_file);
 			}
 
-			if($mail_config['content_filter'] == 'rspamd' && is_file('/etc/init.d/rspamd')) {
+			if($mail_config['content_filter'] == 'rspamd') {
 				$app->services->restartServiceDelayed('rspamd', 'reload');
 			}
 		}
@@ -484,7 +484,7 @@ function spamfilter_wblist_delete($event_name, $data) {
 			}
 
 			if($mail_config['content_filter'] == 'rspamd'){
-				if(is_file('/etc/init.d/rspamd')) $app->services->restartServiceDelayed('rspamd', 'reload');
+				$app->services->restartServiceDelayed('rspamd', 'reload');
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ function spamfilter_wblist_update($event_name, $data) {`
`460`	`460`	`unlink($wblist_file);`
`461`	`461`	`}`
`462`	`462`
`463`		`- if($mail_config['content_filter'] == 'rspamd' && is_file('/etc/init.d/rspamd')) {`
	`463`	`+ if($mail_config['content_filter'] == 'rspamd') {`
`464`	`464`	`$app->services->restartServiceDelayed('rspamd', 'reload');`
`465`	`465`	`}`
`466`	`466`	`}`
`@@ -484,7 +484,7 @@ function spamfilter_wblist_delete($event_name, $data) {`
`484`	`484`	`}`
`485`	`485`
`486`	`486`	`if($mail_config['content_filter'] == 'rspamd'){`
`487`		`- if(is_file('/etc/init.d/rspamd')) $app->services->restartServiceDelayed('rspamd', 'reload');`
	`487`	`+ $app->services->restartServiceDelayed('rspamd', 'reload');`
`488`	`488`	`}`
`489`	`489`	`}`
`490`	`490`	`}`