Relocates log set up to run and adds unique log filename to tests

Author: serra-fastly

src/handler/handlerapp.cpp

@@ -98,6 +98,34 @@ class HandlerApp::Private
 		if (!args.ipcPrefix.isEmpty()) settings.setIpcPrefix(args.ipcPrefix);
 		if (args.portOffset != -1) settings.setPortOffset(args.portOffset);
 
+		// Set the log level
+		if(args.logLevel != -1)
+			log_setOutputLevel(args.logLevel);
+		else
+			log_setOutputLevel(LOG_LEVEL_INFO);
+
+		// Set the log file if specified
+		if(!args.logFile.isEmpty())
+		{
+			if(!log_setFile(args.logFile))
+			{
+				log_error("failed to open log file: %s", qPrintable(args.logFile));
+				exit(1);
+
+			}
+		}
+
+		log_debug("starting...");
+
+		// QSettings doesn't inform us if the config file can't be opened, so do that ourselves
+		{
+			QFile file(args.configFile);
+			if(!file.open(QIODevice::ReadOnly))
+			{
+				log_error("failed to open %s", qPrintable(args.configFile));
+			}
+		}
+
 		QStringList services = settings.value("runner/services").toStringList();
 
 		QStringList connmgr_in_stream_specs = settings.value("proxy/connmgr_in_stream_specs").toStringList();

src/handler/handlerargsdata.cpp

@@ -36,32 +36,4 @@ HandlerArgsData::HandlerArgsData(const ffi::HandlerCliArgs *argsFfi)
     logLevel 	= argsFfi->log_level;
     ipcPrefix 	= QString::fromUtf8(argsFfi->ipc_prefix);
     portOffset  = argsFfi->port_offset;
-
-    // Set the log level
-	if(logLevel != -1)
-        log_setOutputLevel(logLevel);
-    else
-        log_setOutputLevel(LOG_LEVEL_INFO);
-
-    // Set the log file if specified
-    if(!logFile.isEmpty())
-    {
-        if(!log_setFile(logFile))
-        {
-            log_error("failed to open log file: %s", qPrintable(logFile));
-            exit(1);
-
-        }
-    }
-
-    log_debug("starting...");
-
-    // QSettings doesn't inform us if the config file can't be opened, so do that ourselves
-    {
-        QFile file(configFile);
-        if(!file.open(QIODevice::ReadOnly))
-        {
-            log_error("failed to open %s", qPrintable(configFile));
-        }
-    }
 }

src/handler/handlerargstest.cpp

@@ -32,12 +32,9 @@ void handlerargstest()
     // Get file for example config
     std::string configFile = "examples/config/pushpin.conf";
 
-    // Make directory for the log file
-    QDir().mkdir("log");
-
     ffi::HandlerCliArgs argsFfi = {
         const_cast<char*>(configFile.c_str()),  // config_file
-        const_cast<char*>("log/log.txt"),           // log_file
+        const_cast<char*>("handler-log.txt"),           // log_file
         3,                                      // log_level
         const_cast<char*>("ipc:prefix"),        // ipc_prefix
         81                                      // port_offset
@@ -46,7 +43,7 @@ void handlerargstest()
     // Verify HandlerArgsData parsing
     HandlerArgsData args(&argsFfi);
     TEST_ASSERT_EQ(args.configFile, QString("examples/config/pushpin.conf"));
-    TEST_ASSERT_EQ(args.logFile, QString("log/log.txt"));
+    TEST_ASSERT_EQ(args.logFile, QString("handler-log.txt"));
     TEST_ASSERT_EQ(args.logLevel, 3);
     TEST_ASSERT_EQ(args.ipcPrefix, QString("ipc:prefix"));
     TEST_ASSERT_EQ(args.portOffset, 81);

src/proxy/app.cpp

@@ -320,6 +320,34 @@ class App::Private
 		Settings settings(args.configFile);
 		if (!args.ipcPrefix.isEmpty()) settings.setIpcPrefix(args.ipcPrefix);
 
+		// Set the log level
+		if(args.logLevel != -1)
+			log_setOutputLevel(args.logLevel);
+		else
+			log_setOutputLevel(LOG_LEVEL_INFO);
+
+		// Set the log file if specified
+		if(!args.logFile.isEmpty())
+		{
+			if(!log_setFile(args.logFile))
+			{
+				log_error("failed to open log file: %s", qPrintable(args.logFile));
+				exit(1);
+
+			}
+		}
+
+		log_debug("starting...");
+
+		// QSettings doesn't inform us if the config file can't be opened, so do that ourselves
+		{
+			QFile file(args.configFile);
+			if(!file.open(QIODevice::ReadOnly))
+			{
+				log_error("failed to open %s", qPrintable(args.configFile));
+			}
+		}
+
 		QDir configDir = QFileInfo(args.configFile).absoluteDir();
 		QStringList services = settings.value("runner/services").toStringList();
 

src/proxy/proxyargsdata.cpp

@@ -41,32 +41,4 @@ ProxyArgsData::ProxyArgsData(const ffi::ProxyCliArgs *argsFfi)
         routeLines << QString::fromUtf8(argsFfi->routes[i]);
     }
     quietCheck  = argsFfi->quiet_check == 1;
-
-    // Set the log level
-	if(logLevel != -1)
-        log_setOutputLevel(logLevel);
-    else
-        log_setOutputLevel(LOG_LEVEL_INFO);
-
-    // Set the log file if specified
-    if(!logFile.isEmpty())
-    {
-        if(!log_setFile(logFile))
-        {
-            log_error("failed to open log file: %s", qPrintable(logFile));
-            throw std::exception();
-        }
-    }
-
-    log_debug("starting...");
-
-    // QSettings doesn't inform us if the config file can't be opened, so do that ourselves
-    {
-        QFile file(configFile);
-        if(!file.open(QIODevice::ReadOnly))
-        {
-            log_error("failed to open %s", qPrintable(configFile));
-            throw std::exception();
-        }
-    }
 }

src/proxy/proxyargstest.cpp

@@ -33,17 +33,14 @@
     // Get file for example config
     std::string configFile = "examples/config/pushpin.conf";
 
-    // Make directory for the log file
-    QDir().mkdir("log");
-
     // Create test routes array
     const char* route1 = "route1";
     const char* route2 = "route2"; 
     const char* routes[] = { route1, route2 };
 
     ffi::ProxyCliArgs argsFfi = {
         const_cast<char*>(configFile.c_str()),  // config_file
-        const_cast<char*>("log/log.txt"),           // log_file
+        const_cast<char*>("proxy-log.txt"),           // log_file
         3,                                      // log_level
         const_cast<char*>("ipc:prefix"),        // ipc_prefix
         const_cast<char**>(routes),             // routes
@@ -54,7 +51,7 @@
     // Verify ProxyArgsData parsing
     ProxyArgsData args(&argsFfi);
     TEST_ASSERT_EQ(args.configFile, QString("examples/config/pushpin.conf"));
-    TEST_ASSERT_EQ(args.logFile, QString("log/log.txt"));
+    TEST_ASSERT_EQ(args.logFile, QString("proxy-log.txt"));
     TEST_ASSERT_EQ(args.logLevel, 3);
     TEST_ASSERT_EQ(args.ipcPrefix, QString("ipc:prefix"));
     TEST_ASSERT_EQ(args.routeLines, QStringList({"route1", "route2"}));