From ae68ae646575a821a3e2c57cea5ccf1d44e07ef3 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Fri, 10 May 2019 15:34:11 +0300
Subject: [PATCH] Override Volo.Abp log level and enhance logging.

---
 .../Volo/Abp/Cli/Commands/HelpCommand.cs      | 23 +++++++++++++------
 .../Volo/Abp/Cli/Commands/LoginCommand.cs     |  4 +++-
 .../Volo/Abp/Cli/Commands/NewCommand.cs       |  1 +
 .../src/Volo.Abp.Cli/Volo.Abp.Cli.csproj      |  3 +--
 .../src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs  |  2 ++
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs
index 0094783555..671bf3cbab 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs
@@ -1,5 +1,6 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.Cli.Args;
 using Volo.Abp.DependencyInjection;
 
@@ -7,13 +8,21 @@ namespace Volo.Abp.Cli.Commands
 {
     public class HelpCommand : IConsoleCommand, ITransientDependency
     {
+        public ILogger<HelpCommand> Logger { get; set; }
+
+        public HelpCommand()
+        {
+            Logger = NullLogger<HelpCommand>.Instance;
+        }
+
         public Task ExecuteAsync(CommandLineArgs commandLineArgs)
         {
-            Console.WriteLine();
-            Console.WriteLine("Usage:");
-            Console.WriteLine();
-            Console.WriteLine("  abp <command> <target> [options]");
-            Console.WriteLine();
+            Logger.LogInformation("");
+            Logger.LogInformation("Usage:");
+            Logger.LogInformation("");
+            Logger.LogInformation("  abp <command> <target> [options]");
+            Logger.LogInformation("");
+
             return Task.CompletedTask;
         }
     }
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs
index b0c96a7297..28bc64afd5 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs
@@ -25,6 +25,7 @@ namespace Volo.Abp.Cli.Commands
         {
             if (commandLineArgs.Target.IsNullOrEmpty())
             {
+                Logger.LogInformation("");
                 Logger.LogWarning("Username is missing.");
                 LogHelp();
                 return;
@@ -34,6 +35,7 @@ namespace Volo.Abp.Cli.Commands
             var password = ConsoleHelper.ReadSecret();
             if (password.IsNullOrWhiteSpace())
             {
+                Logger.LogInformation("");
                 Logger.LogWarning("Password is missing.");
                 LogHelp();
                 return;
@@ -41,7 +43,7 @@ namespace Volo.Abp.Cli.Commands
 
             await AuthService.LoginAsync(commandLineArgs.Target, password);
 
-            Console.WriteLine($"Successfully logged in as '{commandLineArgs.Target}'");
+            Logger.LogInformation($"Successfully logged in as '{commandLineArgs.Target}'");
         }
 
         private void LogHelp()
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
index c4ab4f6216..6961dcf21a 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
@@ -27,6 +27,7 @@ namespace Volo.Abp.Cli.Commands
         {
             if (commandLineArgs.Target == null)
             {
+                Logger.LogInformation("");
                 Logger.LogWarning("Project name is missing.");
                 Logger.LogWarning("");
                 Logger.LogWarning("Usage:");
diff --git a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj
index 4f0de79850..f28c2554b2 100644
--- a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj
+++ b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj
@@ -12,10 +12,9 @@
 
   <ItemGroup>
     <PackageReference Include="NETStandard.Library" Version="2.0.3" />
-    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.4" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-
   </ItemGroup>
 
   <ItemGroup>
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs
index 0bcff277c6..810be7af6c 100644
--- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs
+++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs
@@ -13,6 +13,8 @@ namespace Volo.Abp.Cli
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Information()
                 .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
+                .MinimumLevel.Override("Volo.Abp", LogEventLevel.Warning)
+                .MinimumLevel.Override("Volo.Abp.Cli", LogEventLevel.Information)
                 .Enrich.FromLogContext()
                 .WriteTo.File(Path.Combine(CliPaths.Log, "abp-cli-logs.txt"))
                 .WriteTo.Console()