Make sure the log isn't locked when rotating it

Also make sure we don't blow up with an uninitialized logger factory

Author: shana

src/GitHub.Logging/Logging.cs

@@ -2,10 +2,37 @@
 
 namespace GitHub.Unity
 {
+    class NullLogAdapter : LogAdapterBase
+    {
+        public NullLogAdapter() : base(null)
+        {}
+
+        protected override void OnInfo(string message)
+        {
+        }
+
+        protected override void OnDebug(string message)
+        {
+        }
+
+        protected override void OnTrace(string message)
+        {
+        }
+
+        protected override void OnWarning(string message)
+        {
+        }
+
+        protected override void OnError(string message)
+        {
+        }
+    }
+
     public static class Logging
     {
-        private static bool tracingEnabled;
+        private static ILogging nullLogger = new NullLogAdapter();
 
+        private static bool tracingEnabled;
         public static bool TracingEnabled
         {
             get
@@ -23,19 +50,13 @@ public static bool TracingEnabled
         }
 
         private static Func<string, ILogging> loggerFactory;
-
         public static Func<string, ILogging> LoggerFactory
         {
             get { return loggerFactory; }
-            set
-            {
-                loggerFactory = value;
-                Instance = loggerFactory(null);
-            }
+            set { loggerFactory = value; }
         }
 
         private static ILogging instance;
-
         private static ILogging Instance
         {
             get {
@@ -60,82 +81,82 @@ public static ILogging GetLogger(Type type)
 
         public static ILogging GetLogger(string context = null)
         {
-            return loggerFactory(context);
+            return loggerFactory?.Invoke(context) ?? nullLogger;
         }
 
         public static void Info(string s)
         {
-            Instance.Info(s);
+            Instance?.Info(s);
         }
 
         public static void Debug(string s)
         {
-            Instance.Debug(s);
+            Instance?.Debug(s);
         }
 
         public static void Trace(string s)
         {
-            Instance.Trace(s);
+            Instance?.Trace(s);
         }
 
         public static void Warning(string s)
         {
-            Instance.Warning(s);
+            Instance?.Warning(s);
         }
 
         public static void Error(string s)
         {
-            Instance.Error(s);
+            Instance?.Error(s);
         }
 
         public static void Info(string format, params object[] objects)
         {
-            Instance.Info(format, objects);
+            Instance?.Info(format, objects);
         }
 
         public static void Debug(string format, params object[] objects)
         {
-            Instance.Debug(format, objects);
+            Instance?.Debug(format, objects);
         }
 
         public static void Trace(string format, params object[] objects)
         {
-            Instance.Trace(format, objects);
+            Instance?.Trace(format, objects);
         }
 
         public static void Warning(string format, params object[] objects)
         {
-            Instance.Warning(format, objects);
+            Instance?.Warning(format, objects);
         }
 
         public static void Error(string format, params object[] objects)
         {
-            Instance.Error(format, objects);
+            Instance?.Error(format, objects);
         }
 
         public static void Info(Exception ex, string s)
         {
-            Instance.Info(ex, s);
+            Instance?.Info(ex, s);
         }
 
         public static void Debug(Exception ex, string s)
         {
-            Instance.Debug(ex, s);
+            Instance?.Debug(ex, s);
         }
 
         public static void Trace(Exception ex, string s)
         {
-            Instance.Trace(ex, s);
+            Instance?.Trace(ex, s);
         }
 
         public static void Warning(Exception ex, string s)
         {
-            Instance.Warning(ex, s);
+            Instance?.Warning(ex, s);
         }
 
         public static void Error(Exception ex, string s)
         {
-            Instance.Error(ex, s);
+            Instance?.Error(ex, s);
         }
     }
 }

src/IntegrationTests/IntegrationTests.csproj

@@ -129,6 +129,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
   </PropertyGroup>

src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs

@@ -11,8 +11,6 @@ namespace GitHub.Unity
     [InitializeOnLoad]
     class EntryPoint : ScriptableObject
     {
-        private static ILogging logger;
-
         private static ApplicationManager appManager;
 
         // this may run on the loader thread if it's an appdomain restart
@@ -27,8 +25,7 @@ static EntryPoint()
 
             var logPath = DefaultEnvironment.LogPath;
 
-            Logging.LoggerFactory = s => new FileLogAdapter(logPath, s);
-            logger = Logging.GetLogger<EntryPoint>();
+            Logging.LoggerFactory = s => new FileLogAdapter(logPath.FileNameWithoutExtension + "-startup" + logPath.ExtensionWithDot, s);
 
             ServicePointManager.ServerCertificateValidationCallback = ServerCertificateValidationCallback;
             EditorApplication.update += Initialize;
@@ -38,12 +35,12 @@ static EntryPoint()
         private static void Initialize()
         {
             EditorApplication.update -= Initialize;
+            var logPath = DefaultEnvironment.LogPath;
 
             if (ApplicationCache.Instance.FirstRun)
             {
                 Debug.Log("Initializing GitHub for Unity version " + ApplicationInfo.Version);
 
-                var logPath = DefaultEnvironment.LogPath;
                 var oldLogPath = logPath.FileNameWithoutExtension + "-old" + logPath.ExtensionWithDot;
 
                 try
@@ -54,6 +51,8 @@ private static void Initialize()
                 {
                     Logging.Error(ex, "Error rotating log files");
                 }
+
+                Logging.LoggerFactory = s => new FileLogAdapter(logPath, s);
                 Debug.Log("Initializing GitHub for Unity log file: " + logPath);
                 Logging.Info("Initializing GitHub for Unity log file: " + logPath);
             }