misc

- renamed is_iis env var
- added timestamps to start config, helps to diagnose slow starts
- cleaned out unused types

Author: shukriadams

src/Tetrifact.Core/DateTimeSpanExtensions.cs

@@ -80,7 +80,7 @@ private static string _agoLocalTime(DateTime beforeUtc, bool shorten = false)
 
         private static string _ago(TimeSpan ts, bool shorten)
         {
-            int count = 0;
+            int count;
             string unit = string.Empty;
             string pluralMod = string.Empty;
             if (ts.TotalDays > 364)
@@ -113,10 +113,18 @@ private static string _ago(TimeSpan ts, bool shorten)
                 unit = shorten ? "m" : "minute";
                 pluralMod = shorten ? string.Empty : "s";
                 return $"{count} {unit}" + (count == 1 ? "" : pluralMod);
+            }
+
+            if (ts.TotalMilliseconds >= 1000)
+            {
+                count = (int)Math.Round(ts.TotalSeconds, 0);
+                unit = shorten ? "s" : "second";
+                pluralMod = shorten ? string.Empty : "s";
+                return $"{count} {unit}" + (count == 1 ? "" : pluralMod);
             }
 
-            count = (int)Math.Round(ts.TotalSeconds, 0);
-            unit = shorten ? "s" : "second";
+            count = (int)Math.Round(ts.TotalMilliseconds, 0);
+            unit = shorten ? "ms" : "millisecond";
             pluralMod = shorten ? string.Empty : "s";
             return $"{count} {unit}" + (count == 1 ? "" : pluralMod);
         }

src/Tetrifact.Core/GlobalFlags.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Tetrifact.Core
+{
+    public class Global
+    {
+        public static DateTime StartTimeUtc { get; private set; } = DateTime.UtcNow;
+    }
+}

src/Tetrifact.Web/Core/Globals.cs

@@ -13,8 +13,9 @@ public class Program
         public static void Main(string[] args)
         {
             Console.WriteLine("*********************************************************************");
-            Console.WriteLine("TETRIFACT : server starting");
+            Console.WriteLine("TETRIFACT server starting");
             Console.WriteLine("");
+
             CreateWebHostBuilder(args).Build().Run();
         }
 
@@ -34,7 +35,7 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args)
                 })
                 .UseStartup<Startup>();
 
-            bool isIIS = Environment.GetEnvironmentVariable("IS_IIS") == "true";
+            bool use_IIS = Environment.GetEnvironmentVariable("TETRIFACT_USE_IIS") == "true";
             bool useHTTPS = EnvironmentArgsHelper.GetAsBool("TETRIFACT_USE_HTTPS");
             string httpsCertPath = Environment.GetEnvironmentVariable("TETRIFACT_HTTPS_CERT_PATH");
             int port = EnvironmentArgsHelper.GetAsInt("TETRIFACT_PORT", 5000);
@@ -44,7 +45,7 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args)
                 useHTTPS = false;
             }
 
-            if (!isIIS)
+            if (!use_IIS)
             {
                 builder.UseKestrel(options =>
                 {
@@ -55,14 +56,15 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args)
                         if (useHTTPS)
                             listenOptions.UseHttps(httpsCertPath);
                     });
-                    Console.WriteLine("Port bound.");
+                    Console.WriteLine($"Port bound ({Global.StartTimeUtc.Ago(true)})");
 
                     // SECURITY WARNING : the limit on attachment part size is removed to support large builds. 
                     options.Limits.MaxRequestBodySize = long.MaxValue;
                     options.Limits.MaxRequestBufferSize = long.MaxValue;
                     options.Limits.MaxRequestLineSize = int.MaxValue;
                 });
-                Console.WriteLine("Kestrel loaded.");
+
+                Console.WriteLine($"Kestrel loaded ({Global.StartTimeUtc.Ago(true)})");
             }
 
             return builder;

src/Tetrifact.Web/Program.cs

@@ -23,7 +23,7 @@
         "STORAGE_COMPRESSION": "False",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "AUTO_CREATE_ARCHIVE_ON_PACKAGE_CREATE": "True",
-        "IS_IIS": "true"
+        "TETRIFACT_USE_IIS": "true"
       }
     },
     "src": {

src/Tetrifact.Web/Properties/launchSettings.json

@@ -12,7 +12,6 @@
 using System.IO.Abstractions;
 using Tetrifact.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Microsoft.Extensions.Hosting.Internal;
 
 namespace Tetrifact.Web
 {
@@ -31,7 +30,7 @@ public Startup(IConfiguration configuration)
         /// <param name="services"></param>
         public void ConfigureServices(IServiceCollection services)
         {
-            Console.WriteLine("Configuring services");
+            Console.WriteLine($"Configuring services ({Global.StartTimeUtc.Ago(true)})");
 
             services.Configure<CookiePolicyOptions>(options =>
             {
@@ -152,7 +151,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
                 }
             });
 
-            Console.WriteLine("Configuring middleware.");
+            Console.WriteLine($"Configuring middleware ({Global.StartTimeUtc.Ago(true)})");
 
 
             app.UseHttpsRedirection();
@@ -213,7 +212,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
                 foreach (ICron cron in crons)
                     cron.Start();
 
-                Console.WriteLine("Server start complete.");
+                Console.WriteLine($"Server configuration complete ({Global.StartTimeUtc.Ago(true)})");
                 Console.WriteLine("*********************************************************************");
             }
         }

src/Tetrifact.Web/Startup.cs

@@ -7,7 +7,7 @@
     <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" hostingModel="InProcess">
       <environmentVariables>
         <environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
-        <environmentVariable name="IS_IIS" value="true" />
+        <environmentVariable name="TETRIFACT_USE_IIS" value="true" />
         <environmentVariable name="LIST_PAGE_SIZE" value="10" />
         <environmentVariable name="AUTH_LEVEL" value="Write" />
         <environmentVariable name="ACCESS_TOKENS" value="" />