Misc updates

Author: mwatson

Src/CoreWebApp/ApplicationLogging.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using StackifyLib.CoreLogger;
+
+namespace CoreWebApp
+{
+    public class ApplicationLogging
+    {
+        private static ILoggerFactory _Factory = null;
+
+        public static void ConfigureLogger(ILoggerFactory factory)
+        {
+            factory.AddDebug(LogLevel.None).AddStackify();
+            factory.AddFile("logFileFromHelper.log"); //serilog file extension
+        }
+
+        public static ILoggerFactory LoggerFactory
+        {
+            get
+            {
+                if (_Factory == null)
+                {
+                    _Factory = new LoggerFactory();
+                    ConfigureLogger(_Factory);
+                }
+                return _Factory;
+            }
+            set { _Factory = value; }
+        }
+        public static ILogger<T> CreateLogger<T>() => LoggerFactory.CreateLogger<T>();
+    }
+}

Src/CoreWebApp/Controllers/SomeOtherClass.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace CoreWebApp.Controllers
+{
+    public class SomeOtherClass
+    {
+        public SomeOtherClass()
+        {
+        }
+
+        public async Task<string> DoBadWebRequest()
+        {
+            try
+            {
+                using (HttpClient hc = new HttpClient())
+                {
+                    var data = await hc.GetStringAsync("https://stackify.comm");
+                    return data;
+                }
+            }
+            catch (Exception ex)
+            {
+                var logger = ApplicationLogging.CreateLogger<SomeOtherClass>();
+                logger.LogError("Error! " + ex.ToString());
+            }
+
+            return null;
+        }
+    }
+}

Src/CoreWebApp/Controllers/ValuesController.cs

@@ -3,6 +3,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using NLog;
 
 namespace CoreWebApp.Controllers
@@ -11,11 +13,15 @@ namespace CoreWebApp.Controllers
     public class ValuesController : Controller
     {
         static NLog.Logger nlog = LogManager.GetCurrentClassLogger();
-        // GET api/values
+
+        private static ILogger<ValuesController> _Logger = ApplicationLogging.CreateLogger<ValuesController>();
+
         [HttpGet]
         public IEnumerable<string> Get()
         {
-            nlog.Debug("Callng Get() method");
+          //  nlog.Debug("Callng Get() method");
+
+            _Logger.LogError("From helper method");
 
             try
             {
@@ -26,6 +32,9 @@ public IEnumerable<string> Get()
                 nlog.Error(ex, "Uh oh");
             }
 
+            SomeOtherClass soc = new SomeOtherClass();
+            soc.DoBadWebRequest();
+
             return new string[] { "value1", "value2" };
         }
 

Src/CoreWebApp/Startup.cs

@@ -61,11 +61,16 @@ public void ConfigureServices(IServiceCollection services)
         /// <param name="loggerFactory"></param>
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddConsole(Configuration.GetSection("Logging"));
-            loggerFactory.AddDebug(LogLevel.Debug);
-            loggerFactory.ConfigureNLog("nlog.config");
-      //      app.ApplicationServices.GetService()
-            loggerFactory.AddStackify();
+            ApplicationLogging.ConfigureLogger(loggerFactory);
+            ApplicationLogging.LoggerFactory = loggerFactory;
+
+            //Debug.WriteLine(Environment.StackTrace);
+            //loggerFactory.AddConsole(Configuration.GetSection("Logging"));
+            //loggerFactory.AddDebug(LogLevel.None);
+            //loggerFactory.AddFile("mylogfile.log", LogLevel.Debug);
+            ////loggerFactory.ConfigureNLog("nlog.config");
+            ////      app.ApplicationServices.GetService()
+            //loggerFactory.AddStackify();
           //  loggerFactory.AddNLog();
         //    loggerFactory.AddSerilog();
 

Src/CoreWebApp/project.json

@@ -18,12 +18,13 @@
     "NLog": "5.0.0-beta05",
     "NLog.Extensions.Logging": "1.0.0-rtm-beta2",
     "Serilog": "2.4.0",
-    "StackifyLib": "1.25.4",
+    "StackifyLib": "2-*",
     "StackifyLib.CoreLogger": "1.0.0-*",
-    "NLog.Targets.Stackify": "1.25.4",
-    "StackifyLib.log4net": "1.25.4",
+    "NLog.Targets.Stackify": "2-*",
+    "StackifyLib.log4net": "2-*",
     "Serilog.Extensions.Logging": "1.4.0",
-    "StackifyLib.AspNetCore": "1.0.0-*"
+    "StackifyLib.AspNetCore": "2-*",
+    "Serilog.Extensions.Logging.File": "1.0.0"
   },
 
   "tools": {

Src/NLog.Targets.Stackify/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.25.4",
+  "version": "2.0.0-beta1",
 
   "title": "NLog.Targets.Stackify",
 
@@ -12,14 +12,14 @@
   },
 
   "dependencies": {
-  "StackifyLib": "1.25.4"
+    "StackifyLib": "2.0.0-*"
   },
 
   "frameworks": {
     "netstandard1.3": {
       "dependencies": {
         "NLog": "5.0.0-beta05"
-      } 
+      }
     },
     "net40": {
       "dependencies": {

Src/Package everything.bat

@@ -0,0 +1,8 @@
+dotnet pack StackifyLib\project.json  -c Release -o ..\BuildOutput
+dotnet pack StackifyLib.AspNetCore\project.json  -c Release -o ..\BuildOutput
+dotnet pack NLog.Targets.Stackify\project.json  -c Release -o ..\BuildOutput
+dotnet pack StackifyLib.CoreLogger\project.json  -c Release -o ..\BuildOutput
+dotnet pack StackifyLib.log4net\project.json  -c Release -o ..\BuildOutput
+dotnet pack StackifyLib.StackifyTraceListener\project.json  -c Release -o ..\BuildOutput
+
+dotnet pack C:\BitBucket\Serilog.Sinks.Stackify\Serilog.Sinks.Stackify\project.json  -c Release -o C:\BitBucket\stackify-api-dotnet\BuildOutput

Src/StackifyLib.AspNetCore/project.json

@@ -1,16 +1,24 @@
 {
-  "version": "1.0.0-*",
+  "version": "2.0.0-beta1",
+
+  "title": "StackifyLib for AspNetCore",
+
+  "packOptions": {
+    "owners": [ "stackify_matt", "jtaylorstackify" ],
+    "tags": [ "stackify", "metrics", "errors", "logs" ],
+    "summary": "Needed to append ASP.NET Core web request details on .NET exceptions"
+  },
 
   "dependencies": {
-    "NETStandard.Library": "1.6.0",
+    "NETStandard.Library": "1.6.1",
     "Microsoft.Extensions.Configuration": "1.1.0",
     "System.ComponentModel": "4.3.0",
     "Microsoft.AspNetCore.Http.Abstractions": "1.0.0",
     "Microsoft.AspNetCore.Http.Extensions": "1.0.0",
     "Microsoft.AspNetCore.Hosting": "1.0.0",
     "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0",
     "Microsoft.AspNetCore.Routing": "1.0.0",
-    "StackifyLib": "1.25.4"
+    "StackifyLib": "2-*"
   },
 
   "frameworks": {

Src/StackifyLib.CoreLogger/StackifyLogger.cs

@@ -19,7 +19,8 @@ public bool IsEnabled(LogLevel logLevel)
             return true;
         }
 
-        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception,
+            Func<TState, Exception, string> formatter)
         {
             if (formatter == null)
                 throw new ArgumentNullException("formatter");
@@ -35,5 +36,17 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
 
             StackifyLib.Logger.QueueLogObject(msg, exception);
         }
+
+        public void Close()
+        {
+            try
+            {
+                StackifyLib.Logger.Shutdown();
+            }
+            catch (Exception)
+            {
+                
+            }
+        }
     }
 }

Src/StackifyLib.CoreLogger/StackifyLoggerProvider.cs

@@ -8,18 +8,21 @@ namespace StackifyLib.CoreLogger
 {
     public class StackifyLoggerProvider : ILoggerProvider, IDisposable
     {
-        public StackifyLoggerProvider()
-        {
-        }
-
+        private StackifyLogger _StackifyLogger = null;
 
         public Microsoft.Extensions.Logging.ILogger CreateLogger(string name)
         {
-            return (Microsoft.Extensions.Logging.ILogger)new StackifyLogger();
+            if (_StackifyLogger == null)
+            {
+                _StackifyLogger = new StackifyLogger();
+            }
+
+            return _StackifyLogger;
         }
 
         public void Dispose()
         {
+            _StackifyLogger?.Close();
         }
     }
 }