From bc41ccd65ba75f06e558d0fede0aa322da238c49 Mon Sep 17 00:00:00 2001
From: David Allemang <allemang.d@gmail.com>
Date: Thu, 9 Mar 2017 15:47:45 -0500
Subject: [PATCH] Tweaked Loggers

---
 Diamond/GLObject.cs        |  5 +----
 Diamond/NLog.config        | 20 ++++++++++++--------
 Diamond/Shaders/Program.cs |  9 ++++++---
 Diamond/Shaders/Shader.cs  |  3 +++
 hexworld/HexRender.cs      |  6 +++++-
 hexworld/hexworld.csproj   |  5 ++++-
 6 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/Diamond/GLObject.cs b/Diamond/GLObject.cs
index a30ae3f..b7b434f 100644
--- a/Diamond/GLObject.cs
+++ b/Diamond/GLObject.cs
@@ -6,10 +6,7 @@ namespace Diamond
 {
     public abstract class GLObject : IDisposable
     {
-        /// <summary>
-        /// The logger for GLObject-related info
-        /// </summary>
-        protected internal static Logger Logger = LogManager.GetLogger(nameof(GLObject));
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         /// <summary>
         /// The OpenGL object name
diff --git a/Diamond/NLog.config b/Diamond/NLog.config
index 422a841..65bd082 100644
--- a/Diamond/NLog.config
+++ b/Diamond/NLog.config
@@ -6,16 +6,20 @@
       throwExceptions="false"
       internalLoggerLevel="Off" internalLoggerFile="c:\temp\nlog-internal.log">
 
-  <variable name="Layout" value="[${level}] ${logger}: ${message}" />
-  
+  <variable name="fileHeader" value="[${date:format=HH\:mm\:ss.ff}] [${level}] ${logger:shortName=false}"/>
+  <variable name="debugHeader" value="[${level}] ${logger:shortName=true}"/>
+
   <targets>
-    <target xsi:type="File" name="file" fileName="$Log/${shortdate}.log"
-            layout="${Layout}"/>
-    <target xsi:type="Debugger" name="debug" layout="${Layout}"/>
+    <target name="logFile"
+      xsi:type="File"
+      fileName="${basedir}/logs/${date:format=yyyMMdd_HHmmss:cached=true}.log"
+      layout="${fileHeader}: ${message}" />
+
+    <target xsi:type="Debugger" name="debug" layout="${debugHeader}: ${message}"/>
   </targets>
 
   <rules>
-    <logger name="*" minlevel="Info" writeTo="file"/>
-    <logger name="*" minlevel="Trace" writeTo="debug"/>
+    <logger name="*" minlevel="Debug" writeTo="logFile"/>
+    <logger name="*" minlevel="Debug" writeTo="debug"/>
   </rules>
-</nlog>
+</nlog>
\ No newline at end of file
diff --git a/Diamond/Shaders/Program.cs b/Diamond/Shaders/Program.cs
index 94b0536..a1be8e7 100644
--- a/Diamond/Shaders/Program.cs
+++ b/Diamond/Shaders/Program.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using NLog;
 using OpenTK.Graphics.OpenGL4;
 
 namespace Diamond.Shaders
@@ -11,6 +12,8 @@ namespace Diamond.Shaders
     /// </summary>
     public class Program : GLObject
     {
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+
         #region Static
 
         private static Program _current;
@@ -23,13 +26,13 @@ namespace Diamond.Shaders
             get => _current;
             set
             {
-                if (!value?.Linked ?? false)
+                if (value != null && !value.Linked)
                 {
-                    Logger.Error("Cannot use program {0}", value);
+                    Logger.Error("Cannot use {0} because it is not linked", value);
                     value = null;
                 }
 
-                Logger.Debug("Using program {0}", value);
+                Logger.Debug("Using {0}", (object) value ?? "default program");
                 GL.UseProgram((_current = value)?.Id ?? 0);
             }
         }
diff --git a/Diamond/Shaders/Shader.cs b/Diamond/Shaders/Shader.cs
index 17c8980..b5eb4e4 100644
--- a/Diamond/Shaders/Shader.cs
+++ b/Diamond/Shaders/Shader.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
+using NLog;
 using OpenTK.Graphics.OpenGL4;
 
 namespace Diamond.Shaders
@@ -9,6 +10,8 @@ namespace Diamond.Shaders
     /// </summary>
     public sealed class Shader : GLObject
     {
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+
         #region Constructor, Delete()
 
         /// <summary>
diff --git a/hexworld/HexRender.cs b/hexworld/HexRender.cs
index ee30754..0de084c 100644
--- a/hexworld/HexRender.cs
+++ b/hexworld/HexRender.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Diamond.Shaders;
@@ -29,7 +30,7 @@ namespace hexworld
         {
             base.OnUnload(e);
 
-            _pgm.Dispose();
+            _pgm?.Dispose();
         }
 
         /// <inheritdoc />
@@ -38,6 +39,9 @@ namespace hexworld
             base.OnLoad(e);
 
             _pgm = Program.FromFiles("res/obj.fs.glsl", "res/obj.vs.glsl");
+
+            Program.Current = _pgm;
+            Program.Current = null;
         }
     }
 }
\ No newline at end of file
diff --git a/hexworld/hexworld.csproj b/hexworld/hexworld.csproj
index b61e5a9..1ed6a79 100644
--- a/hexworld/hexworld.csproj
+++ b/hexworld/hexworld.csproj
@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{AD9ED057-FB47-44CB-8839-22924B409706}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <RootNamespace>hexworld</RootNamespace>
     <AssemblyName>hexworld</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
@@ -33,6 +33,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>