From e01699c5284bdb45f88ee6335dc90f25f4932b66 Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Fri, 4 Jun 2021 16:46:59 +0200
Subject: bot: reorder fork sequence

We do the actual fork as the last step, after redirecting the
standard I/O streams. This also ensures that no log messages
are shown on console _after_ forking.
---
 lib/rbot/ircbot.rb | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'lib/rbot')

diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb
index 564403f5..058e7bbe 100644
--- a/lib/rbot/ircbot.rb
+++ b/lib/rbot/ircbot.rb
@@ -403,26 +403,6 @@ class Bot
       debug "Using `#{@logfile}' as debug log"
     end
 
-    LoggerManager.instance.flush
-
-    # See http://blog.humlab.umu.se/samuel/archives/000107.html
-    # for the backgrounding code
-    if $daemonize
-      begin
-        exit if fork
-        Process.setsid
-        exit if fork
-      rescue NotImplementedError
-        warning "Could not background, fork not supported"
-      rescue SystemExit
-        exit 0
-      rescue Exception => e
-        warning "Could not background. #{e.pretty_inspect}"
-      end
-      Dir.chdir botclass
-      # File.umask 0000                # Ensure sensible umask. Adjust as needed.
-    end
-
     # setup logger based on bot configuration, if not set from the command line
     loglevel_set = $opts.has_key?('debug') or $opts.has_key?('loglevel')
     LoggerManager.instance.set_level(@config['log.level']) unless loglevel_set
@@ -459,9 +439,25 @@ class Bot
         return str.bytesize
       end
 
-      LoggerManager.instance.log_session_start
+      # See http://blog.humlab.umu.se/samuel/archives/000107.html
+      # for the backgrounding code
+      begin
+        exit if fork
+        Process.setsid
+        exit if fork
+      rescue NotImplementedError
+        warning "Could not background, fork not supported"
+      rescue SystemExit
+        exit 0
+      rescue Exception => e
+        warning "Could not background. #{e.pretty_inspect}"
+      end
+      Dir.chdir botclass
+      # File.umask 0000                # Ensure sensible umask. Adjust as needed.
     end
 
+    LoggerManager.instance.log_session_start
+
     File.open($opts['pidfile'] || File.join(@botclass, 'rbot.pid'), 'w') do |pf|
       pf << "#{$$}\n"
     end
-- 
cgit v1.2.3