Move the call to LogInitialise.

YSFGateway/YSFGateway.cpp

@@ -108,33 +108,28 @@ int CYSFGateway::run()
 
 	setlocale(LC_ALL, "C");
 
-	ret = ::LogInitialise(m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel());
-	if (!ret) {
-		::fprintf(stderr, "YSFGateway: unable to open the log file\n");
-		return 1;
-	}
-
 #if !defined(_WIN32) && !defined(_WIN64)
 	bool m_daemon = m_conf.getDaemon();
 	if (m_daemon) {
 		// Create new process
 		pid_t pid = ::fork();
 		if (pid == -1) {
-			::LogWarning("Couldn't fork() , exiting");
+			::fprintf(stderr, "Couldn't fork() , exiting\n");
 			return -1;
 		}
-		else if (pid != 0)
+		else if (pid != 0) {
 			exit(EXIT_SUCCESS);
+		}
 
 		// Create new session and process group
 		if (::setsid() == -1) {
-			::LogWarning("Couldn't setsid(), exiting");
+			::fprintf(stderr, "Couldn't setsid(), exiting\n");
 			return -1;
 		}
 
 		// Set the working directory to the root directory
 		if (::chdir("/") == -1) {
-			::LogWarning("Couldn't cd /, exiting");
+			::fprintf(stderr, "Couldn't cd /, exiting\n");
 			return -1;
 		}
 
@@ -142,37 +137,43 @@ int CYSFGateway::run()
 		::close(STDOUT_FILENO);
 		::close(STDERR_FILENO);
 
-		//If we are currently root...
+		// If we are currently root...
 		if (getuid() == 0) {
 			struct passwd* user = ::getpwnam("mmdvm");
 			if (user == NULL) {
-				::LogError("Could not get the mmdvm user, exiting");
+				::fprintf(stderr, "Could not get the mmdvm user, exiting\n");
 				return -1;
 			}
 
 			uid_t mmdvm_uid = user->pw_uid;
 			gid_t mmdvm_gid = user->pw_gid;
 
-			//Set user and group ID's to mmdvm:mmdvm
+			// Set user and group ID's to mmdvm:mmdvm
 			if (setgid(mmdvm_gid) != 0) {
-				::LogWarning("Could not set mmdvm GID, exiting");
+				::fprintf(stderr, "Could not set mmdvm GID, exiting\n");
 				return -1;
 			}
 
 			if (setuid(mmdvm_uid) != 0) {
-				::LogWarning("Could not set mmdvm UID, exiting");
+				::fprintf(stderr, "Could not set mmdvm UID, exiting\n");
 				return -1;
 			}
 
-			//Double check it worked (AKA Paranoia) 
+			// Double check it worked (AKA Paranoia) 
 			if (setuid(0) != -1) {
-				::LogWarning("It's possible to regain root - something is wrong!, exiting");
+				::fprintf(stderr, "It's possible to regain root - something is wrong!, exiting\n");
 				return -1;
 			}
 		}
 	}
 #endif
 
+	ret = ::LogInitialise(m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel());
+	if (!ret) {
+		::fprintf(stderr, "YSFGateway: unable to open the log file\n");
+		return 1;
+	}
+
 	m_callsign = m_conf.getCallsign();
 	m_suffix   = m_conf.getSuffix();
 

YSFReflector/YSFReflector.cpp

@@ -1,5 +1,5 @@
 /*
-*   Copyright (C) 2016 by Jonathan Naylor G4KLX
+*   Copyright (C) 2016,2018 by Jonathan Naylor G4KLX
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -93,33 +93,27 @@ void CYSFReflector::run()
 		return;
 	}
 
-	ret = ::LogInitialise(m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel());
-	if (!ret) {
-		::fprintf(stderr, "YSFReflector: unable to open the log file\n");
-		return;
-	}
-
 #if !defined(_WIN32) && !defined(_WIN64)
 	bool m_daemon = m_conf.getDaemon();
 	if (m_daemon) {
 		// Create new process
 		pid_t pid = ::fork();
 		if (pid == -1) {
-			::LogWarning("Couldn't fork() , exiting");
+			::fprintf(stderr, "Couldn't fork() , exiting\n");
 			return;
-		}
-		else if (pid != 0)
+		} else if (pid != 0) {
 			exit(EXIT_SUCCESS);
+		}
 
 		// Create new session and process group
 		if (::setsid() == -1) {
-			::LogWarning("Couldn't setsid(), exiting");
+			::fprintf(stderr, "Couldn't setsid(), exiting\n");
 			return;
 		}
 
 		// Set the working directory to the root directory
 		if (::chdir("/") == -1) {
-			::LogWarning("Couldn't cd /, exiting");
+			::fprintf(stderr, "Couldn't cd /, exiting\n");
 			return;
 		}
 
@@ -127,37 +121,43 @@ void CYSFReflector::run()
 		::close(STDOUT_FILENO);
 		::close(STDERR_FILENO);
 
-		//If we are currently root...
+		// If we are currently root...
 		if (getuid() == 0) {
 			struct passwd* user = ::getpwnam("mmdvm");
 			if (user == NULL) {
-				::LogError("Could not get the mmdvm user, exiting");
+				::fprintf(stderr, "Could not get the mmdvm user, exiting\n");
 				return;
 			}
 
 			uid_t mmdvm_uid = user->pw_uid;
 			gid_t mmdvm_gid = user->pw_gid;
 
-			//Set user and group ID's to mmdvm:mmdvm
+			// Set user and group ID's to mmdvm:mmdvm
 			if (setgid(mmdvm_gid) != 0) {
-				::LogWarning("Could not set mmdvm GID, exiting");
+				::fprintf(stderr, "Could not set mmdvm GID, exiting\n");
 				return;
 			}
 
 			if (setuid(mmdvm_uid) != 0) {
-				::LogWarning("Could not set mmdvm UID, exiting");
+				::fprintf(stderr, "Could not set mmdvm UID, exiting\n");
 				return;
 			}
 
-			//Double check it worked (AKA Paranoia) 
+			// Double check it worked (AKA Paranoia) 
 			if (setuid(0) != -1) {
-				::LogWarning("It's possible to regain root - something is wrong!, exiting");
+				::fprintf(stderr, "It's possible to regain root - something is wrong!, exiting\n");
 				return;
 			}
 		}
 	}
 #endif
 
+	ret = ::LogInitialise(m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel());
+	if (!ret) {
+		::fprintf(stderr, "YSFReflector: unable to open the log file\n");
+		return;
+	}
+
 	CNetwork network(m_conf.getNetworkPort(), m_conf.getName(), m_conf.getDescription(), m_conf.getNetworkDebug());
 
 	ret = network.open();