More logging enhancements

Author: JoshuaTheMiller

src/app.ts

@@ -5,7 +5,9 @@ import fs from "fs";
 import path from "node:path";
 import swaggerUi from "swagger-ui-express";
 import { routes } from "./routes";
-import { Log } from "./logging";
+import { Log, SetupLogging } from "./logging";
+
+SetupLogging();
 
 const app = express();
 
@@ -36,7 +38,7 @@ app.use((req: any, res: any) => {
     })
 });
 
-Log({
+console.log({
   HostPort: port,
   ForwardingGitHubRequestsTo: process.env.GITHUB_PROXY ?? "Not forwarding",
   ForwardingGroupRequestsTo: process.env.SOURCE_PROXY ?? "Not forwarding"

src/logging.ts

@@ -1,9 +1,11 @@
-import appInsights from "applicationinsights";
+const appInsights = require("applicationinsights");
+
+import { TelemetryType } from "applicationinsights/out/Declarations/Contracts";
 import TelemetryClient from "applicationinsights/out/Library/TelemetryClient";
 
-export interface ILogger {
-    Log(s:any):void
-    LogError(s:any):void
+interface ILogger {
+    Log(s:string):void
+    LogError(ex: Error):void
 }
 
 class AiLogger implements ILogger {
@@ -12,37 +14,46 @@ class AiLogger implements ILogger {
     constructor(client: TelemetryClient) {
         this.client = client;
     }
-    Log(s: any): void {
-        throw new Error("Method not implemented.");
+    Log(s: string): void {
+        console.log(s);
+        this.client.trackTrace({
+            message: s                     
+        });
     }
-    LogError(s: any): void {
-        throw new Error("Method not implemented.");
+    LogError(ex: Error): void {
+        console.log(ex);
+        this.client.trackException({
+            exception: ex
+        });
     }
 }
 
 class StdLogger implements ILogger {
-    Log(s: any): void {
+    Log(s: string): void {
         console.log(s);
     }
-    LogError(s: any): void {
-        console.log(s);
+    LogError(ex: Error): void {
+        console.log(ex);
     }
 }
 
 let logger: ILogger = new StdLogger();
 
-if(process.env.APPLICATIONINSIGHTS_CONNECTION_STRING) {
-    appInsights.setup().start();
-
-    const telemetryClient = appInsights.defaultClient;
-
-    logger = new AiLogger(telemetryClient);
-}
-
-export function Log(s:any) {
+export function Log(s:string) {
     logger.Log(s);
 } 
 
-export function LogError(s:any) {
-    logger.LogError(s);
-} 
+export function LogError(ex: Error) {
+    logger.LogError(ex);
+} 
+
+export function SetupLogging() {
+    if(process.env.APPLICATIONINSIGHTS_CONNECTION_STRING) {
+        console.log("Using AppInsights Logger")
+        appInsights.setup(process.env.APPLICATIONINSIGHTS_CONNECTION_STRING).start();
+    
+        const telemetryClient = appInsights.defaultClient;
+    
+        logger = new AiLogger(telemetryClient);
+    }
+}

src/services/githubSync.ts

@@ -1,6 +1,6 @@
 // REMEMBER TO REPLACE '_' with '-' for GitHub Names! 🤦‍♂️
 
-import { Log } from "../logging";
+import { Log, LogError } from "../logging";
 import { AppConfig } from "./appConfig";
 import { GitHubId, InstalledClient } from "./gitHubTypes";
 import { SearchAllAsync } from "./ldapClient";
@@ -264,7 +264,7 @@ async function syncOrg(installedGitHubClient: InstalledClient, config: AppConfig
 
     const orgConfig = orgConfigResponse.data;
 
-    Log(orgConfig);
+    Log(JSON.stringify(orgConfig));
 
     let currentMembers: GitHubId[] = [];
     if (orgConfig.OrganizationMembersGroup != undefined || orgConfig.OrganizationMembersGroup != null) {
@@ -323,7 +323,7 @@ export async function SyncOrg(installedGitHubClient: InstalledClient, config: Ap
         return await syncOrg(installedGitHubClient, config);
     }
     catch(error) {
-        Log(error);
+        LogError(error as any);
 
         return {
             message: "Failed to sync org. Please check logs.",

src/services/ldapClient.ts

@@ -3,7 +3,7 @@ import ldap from "ldapjs";
 import ldapEscape from "ldap-escape";
 import axios from "axios";
 import axiosRetry from "axios-retry";
-import { Log } from "../logging";
+import { Log, LogError } from "../logging";
 
 const config = Config()
 
@@ -14,8 +14,12 @@ if(!process.env.SOURCE_PROXY) {
         url: [config.LDAP.Server]
     });
 
-    client.bind(config.LDAP.User, config.LDAP.Password, (err) => {
-        Log(err);
+    client.bind(config.LDAP.User, config.LDAP.Password, (err, result) => {
+        if(err) {
+            LogError(JSON.stringify(err) as any);
+        }        
+        
+        console.log("Connected to LDAP Server");
     });
 }
 else {