Merge pull request #513 from smartdevicelink/hotfix/issue_512_debug_tool

Fixed SDLDebugTool deleting log file after proxy restart

2 files changed, 12 insertions, 4 deletions

diff --git a/SmartDeviceLink/SDLDebugTool.m b/SmartDeviceLink/SDLDebugTool.m
index 8bf8c7bda..c07f206c1 100644
--- a/SmartDeviceLink/SDLDebugTool.m
+++ b/SmartDeviceLink/SDLDebugTool.m
@@ -185,6 +185,10 @@
 }
 
 - (void)sdl_enableDebugToLogFile {
+    if (self.debugToLogFile) {
+        return;
+    }
+    
     [SDLDebugTool logInfo:@"Enabling Log File" withType:SDLDebugType_Debug];
 
     self.debugToLogFile = YES;
diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m
index e322452f3..a9d5a86a1 100644
--- a/SmartDeviceLink/SDLLifecycleManager.m
+++ b/SmartDeviceLink/SDLLifecycleManager.m
@@ -87,6 +87,9 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
     _configuration = configuration;
     _delegate = delegate;
 
+    // Logging
+    [self.class sdl_updateLoggingWithFlags:self.configuration.lifecycleConfig.logFlags];
+
     // Private properties
     _lifecycleStateMachine = [[SDLStateMachine alloc] initWithTarget:self initialState:SDLLifecycleStateStopped states:[self.class sdl_stateTransitionDictionary]];
     _lastCorrelationId = 0;
@@ -99,6 +102,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
     _permissionManager = [[SDLPermissionManager alloc] init];
     _lockScreenManager = [[SDLLockScreenManager alloc] initWithConfiguration:_configuration.lockScreenConfig notificationDispatcher:_notificationDispatcher presenter:[[SDLLockScreenPresenter alloc] init]];
 
+    // Notifications
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(transportDidConnect) name:SDLTransportDidConnect object:_notificationDispatcher];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(transportDidDisconnect) name:SDLTransportDidDisconnect object:_notificationDispatcher];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hmiStatusDidChange:) name:SDLDidChangeHMIStatusNotification object:_notificationDispatcher];
@@ -150,9 +154,6 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
 }
 
 - (void)didEnterStateStarted {
-    // Set up our logging capabilities based on the config
-    [self.class sdl_updateLoggingWithFlags:self.configuration.lifecycleConfig.logFlags];
-    
     // Start up the internal proxy object
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -412,7 +413,10 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready";
 }
 
 + (void)sdl_updateLoggingWithFlags:(SDLLogOutput)logFlags {
-    [SDLDebugTool disable];
+    if (logFlags == SDLLogOutputNone) {
+        [SDLDebugTool disable];
+        return;
+    }
 
     if ((logFlags & SDLLogOutputConsole) == SDLLogOutputConsole) {
         [SDLDebugTool enable];