From bcfa8b9c306cc871b5851d7c07ef0759eb1bcb31 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Wed, 23 Nov 2016 15:25:31 -0800
Subject: [PATCH] avoid setting logfile path too early, from #37802

---
 FS/FS/Daemon.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/FS/FS/Daemon.pm b/FS/FS/Daemon.pm
index 4ecd80e98..a3c16d888 100644
--- a/FS/FS/Daemon.pm
+++ b/FS/FS/Daemon.pm
@@ -64,12 +64,6 @@ sub daemonize1 {
     $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
   }
 
-  # set the logfile sensibly
-  if (!$logfile) {
-    my $logname = $me;
-    $logname =~ s/^freeside-//;
-    logfile("%%%FREESIDE_LOG%%%/$logname-log.$FS::UID::datasrc");
-  }
 }
 
 sub drop_root {
@@ -122,6 +116,12 @@ sub _die {
 
 sub _logmsg {
   chomp( my $msg = shift );
+  # set the logfile sensibly
+  if (!$logfile) {
+    my $logname = $me;
+    $logname =~ s/^freeside-//;
+    logfile("%%%FREESIDE_LOG%%%/$logname-log.$FS::UID::datasrc");
+  }
   my $log = new IO::File ">>$logfile";
   flock($log, LOCK_EX);
   seek($log, 0, 2);
-- 
2.11.0