From 8b74730d08788434b4a2d5d25f4a37e41e26eaee Mon Sep 17 00:00:00 2001
From: witzig <git.witzig@icloud.com>
Date: Thu, 22 Jun 2017 18:29:42 +0200
Subject: [PATCH] Fixed remaining eslint errors for services/**/*.js

---
 services/executor.js    | 12 ++++++------
 services/feedcheck.js   |  2 +-
 services/verp-server.js |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/services/executor.js b/services/executor.js
index 4d10814e..42b1294f 100644
--- a/services/executor.js
+++ b/services/executor.js
@@ -37,14 +37,14 @@ function spawnProcess(tid, executable, args, outFile, errFile, cwd, uid, gid) {
                 return;
             }
 
-            privilegeHelpers.ensureMailtrainOwner(outFile, (err) => {
+            privilegeHelpers.ensureMailtrainOwner(outFile, err => {
                 if (err) {
-                    log.warn('Executor', 'Cannot change owner of output file of process tid:%s.', tid)
+                    log.warn('Executor', 'Cannot change owner of output file of process tid:%s.', tid);
                 }
 
-                privilegeHelpers.ensureMailtrainOwner(errFile, (err) => {
+                privilegeHelpers.ensureMailtrainOwner(errFile, err => {
                     if (err) {
-                        log.warn('Executor', 'Cannot change owner of error output file of process tid:%s.', tid)
+                        log.warn('Executor', 'Cannot change owner of error output file of process tid:%s.', tid);
                     }
 
                     const options = {
@@ -79,12 +79,12 @@ function spawnProcess(tid, executable, args, outFile, errFile, cwd, uid, gid) {
                         delete processes[tid];
                         log.info('Executor', 'Process tid:%s pid:%s exited with code %s signal %s.', tid, pid, code, signal);
 
-                        fs.close(outFd, (err) => {
+                        fs.close(outFd, err => {
                             if (err) {
                                 log.error('Executor', err);
                             }
 
-                            fs.close(errFd, (err) => {
+                            fs.close(errFd, err => {
                                 if (err) {
                                     log.error('Executor', err);
                                 }
diff --git a/services/feedcheck.js b/services/feedcheck.js
index 5f43c479..b2871d38 100644
--- a/services/feedcheck.js
+++ b/services/feedcheck.js
@@ -135,7 +135,7 @@ function checkEntries(parent, entries, callback) {
                 if (/\[RSS_ENTRY[\w]*\]/i.test(html)) {
                     html = html.replace(/\[RSS_ENTRY\]/, entry.content); //for backward compatibility
                     Object.keys(entry).forEach(key => {
-                        html = html.replace('\[RSS_ENTRY_'+key.toUpperCase()+'\]', entry[key])
+                        html = html.replace('[RSS_ENTRY_' + key.toUpperCase() + ']', entry[key]);
                     });
                 } else {
                     html = entry.content + html;
diff --git a/services/verp-server.js b/services/verp-server.js
index d1fac80d..24150147 100644
--- a/services/verp-server.js
+++ b/services/verp-server.js
@@ -29,7 +29,7 @@ let server = new SMTPServer({
             let user = address.address.split('@').shift();
             let host = address.address.split('@').pop();
 
-            if (host !== configItems.verpHostname || !/^[a-z0-9_\-]+\.[a-z0-9_\-]+\.[a-z0-9_\-]+$/i.test(user)) {
+            if (host !== configItems.verpHostname || !/^[a-z0-9_-]+\.[a-z0-9_-]+\.[a-z0-9_-]+$/i.test(user)) {
                 err = new Error('Unknown user ' + address.address);
                 err.responseCode = 510;
                 return callback(err);