diff --git a/fail2ban/client/fail2banclient.py b/fail2ban/client/fail2banclient.py index e3797279..4e42680b 100755 --- a/fail2ban/client/fail2banclient.py +++ b/fail2ban/client/fail2banclient.py @@ -227,11 +227,11 @@ class Fail2banClient(Fail2banCmdLine, Thread): # prepare: read config, check configuration is valid, etc.: if phase is not None: phase['start'] = True - logSys.debug('-- client phase %s', phase) + logSys.debug(' client phase %s', phase) stream = self.__prepareStartServer() if phase is not None: phase['ready'] = phase['start'] = (True if stream else False) - logSys.debug('-- client phase %s', phase) + logSys.debug(' client phase %s', phase) if not stream: return False # configure server with config stream: @@ -248,7 +248,7 @@ class Fail2banClient(Fail2banCmdLine, Thread): def __processCommand(self, cmd): if len(cmd) == 1 and cmd[0] == "start": - + ret = self.__startServer(self._conf["background"]) if not ret: return False @@ -322,7 +322,7 @@ class Fail2banClient(Fail2banCmdLine, Thread): # Wait for the server to start (the server has 30 seconds to answer ping) starttime = time.time() logSys.debug("__waitOnServer: %r", (alive, maxtime)) - test = lambda: os.path.exists(self._conf["socket"]) and self.__ping() + test = lambda: os.path.exists(self._conf["socket"]) and self.__ping() with VisualWait(self._conf["verbose"]) as vis: sltime = 0.0125 / 2 while self._alive: @@ -432,7 +432,7 @@ class _VisualWait: self.pos += self.delta if self.delta > 0: s = " #\x1b[1D" if self.pos > 1 else "# \x1b[2D" - else: + else: s = "\x1b[1D# \x1b[2D" sys.stdout.write(s) sys.stdout.flush() diff --git a/fail2ban/client/fail2bancmdline.py b/fail2ban/client/fail2bancmdline.py index aadf823a..4cb1927e 100644 --- a/fail2ban/client/fail2bancmdline.py +++ b/fail2ban/client/fail2bancmdline.py @@ -112,7 +112,7 @@ class Fail2banCmdLine(): output(" --timeout timeout to wait for the server (for internal usage only, don't read configuration)") output(" -h, --help display this help message") output(" -V, --version print the version") - + if not caller.endswith('server'): output("") output("Command:") @@ -185,7 +185,7 @@ class Fail2banCmdLine(): if ret is not None: return ret - logSys.debug("-- conf: %r, args: %r", self._conf, self._args) + logSys.debug(" conf: %r, args: %r", self._conf, self._args) if initial and PRODUCTION: # pragma: no cover - can't test verbose = self._conf["verbose"] diff --git a/fail2ban/client/fail2banserver.py b/fail2ban/client/fail2banserver.py index a511e017..9f825bf1 100644 --- a/fail2ban/client/fail2banserver.py +++ b/fail2ban/client/fail2banserver.py @@ -46,7 +46,7 @@ class Fail2banServer(Fail2banCmdLine): @staticmethod def startServerDirect(conf, daemon=True): - logSys.debug("-- direct starting of server in %s, deamon: %s", os.getpid(), daemon) + logSys.debug(" direct starting of server in %s, deamon: %s", os.getpid(), daemon) from ..server.server import Server server = None try: @@ -54,7 +54,7 @@ class Fail2banServer(Fail2banCmdLine): # server object will internally fork self if daemon is True server = Server(daemon) server.start(conf["socket"], - conf["pidfile"], conf["force"], + conf["pidfile"], conf["force"], conf=conf) except Exception as e: # pragma: no cover try: @@ -79,7 +79,7 @@ class Fail2banServer(Fail2banCmdLine): frk = not conf["async"] and PRODUCTION if frk: # pragma: no cover pid = os.fork() - logSys.debug("-- async starting of server in %s, fork: %s - %s", os.getpid(), frk, pid) + logSys.debug(" async starting of server in %s, fork: %s - %s", os.getpid(), frk, pid) if pid == 0: args = list() args.append(SERVER)