From 3f5d0601e1ccef8c15c5c96bdf46032b86a4d081 Mon Sep 17 00:00:00 2001
From: Jonathan Giszczak <giszczakj@objectcomputing.com>
Date: Fri, 8 Dec 2017 16:06:45 -0600
Subject: [PATCH] Move default location of logging.json to data directory.

---
 application.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/application.cpp b/application.cpp
index aa9e10f82..f0960696e 100644
--- a/application.cpp
+++ b/application.cpp
@@ -106,15 +106,6 @@ bool application::initialize_impl(int argc, char** argv, vector<abstract_plugin*
       return false;
    }
 
-   bfs::path logconf = "logging.json";
-   if( options.count("logconf") )
-   {
-     logconf = options["logconf"].as<bfs::path>();
-     if( logconf.is_relative() )
-       logconf = bfs::current_path() / logconf;
-   }
-   my->_logging_conf = logconf;
-
    bfs::path data_dir = "data-dir";
    if( options.count("data-dir") )
    {
@@ -124,6 +115,15 @@ bool application::initialize_impl(int argc, char** argv, vector<abstract_plugin*
    }
    my->_data_dir = data_dir;
 
+   bfs::path logconf = data_dir / "logging.json";
+   if( options.count("logconf") )
+   {
+     logconf = options["logconf"].as<bfs::path>();
+     if( logconf.is_relative() )
+       logconf = data_dir / logconf;
+   }
+   my->_logging_conf = logconf;
+
    bfs::path config_file_name = data_dir / "config.ini";
    if( options.count( "config" ) ) {
       auto config_file_name = options["config"].as<bfs::path>();