scriptcs#538 Changing logic to display a single warning if a load failure occurs

glennblock · glennblock · commit 425987836f5b · 2013-12-24T09:04:45.000Z
diff --git a/src/ScriptCs.Hosting/RuntimeServices.cs b/src/ScriptCs.Hosting/RuntimeServices.cs
@@ -68,6 +68,8 @@ protected override IContainer CreateContainer()
                 var assemblies = assemblyResolver.GetAssemblyPaths(currentDirectory);
 
                 var aggregateCatalog = new AggregateCatalog();
+                bool assemblyLoadFailures = false;
+
                 foreach (var assembly in assemblies)
                 {
                     try
@@ -78,11 +80,17 @@ protected override IContainer CreateContainer()
                     }
                     catch(Exception ex)
                     {
-                        this.Logger.WarnFormat("Failed loading Assembly {0}", assembly);
-                        this.Logger.Debug(ex.Message);
+                        assemblyLoadFailures = true;
+                        Logger.DebugFormat("Failure loading assembly: {0}. Exception: {1}", assembly, ex.Message);
                     }
                 }
-
+                if (assemblyLoadFailures)
+                {
+                    if (_scriptName == null || _scriptName.Length == 0)
+                        Logger.Warn("Some assemblies failed to load. Launch with '-repl -loglevel debug' to see the details");
+                    else    
+                        Logger.Warn("Some assemblies failed to load. Launch with '-loglevel debug' to see the details");
+                }
                 builder.RegisterComposablePartCatalog(aggregateCatalog);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ protected override IContainer CreateContainer()`
`68`	`68`	`var assemblies = assemblyResolver.GetAssemblyPaths(currentDirectory);`
`69`	`69`
`70`	`70`	`var aggregateCatalog = new AggregateCatalog();`
	`71`	`+ bool assemblyLoadFailures = false;`
	`72`	`+`
`71`	`73`	`foreach (var assembly in assemblies)`
`72`	`74`	`{`
`73`	`75`	`try`
`@@ -78,11 +80,17 @@ protected override IContainer CreateContainer()`
`78`	`80`	`}`
`79`	`81`	`catch(Exception ex)`
`80`	`82`	`{`
`81`		`- this.Logger.WarnFormat("Failed loading Assembly {0}", assembly);`
`82`		`- this.Logger.Debug(ex.Message);`
	`83`	`+ assemblyLoadFailures = true;`
	`84`	`+ Logger.DebugFormat("Failure loading assembly: {0}. Exception: {1}", assembly, ex.Message);`
`83`	`85`	`}`
`84`	`86`	`}`
`85`		`-`
	`87`	`+ if (assemblyLoadFailures)`
	`88`	`+ {`
	`89`	`+ if (_scriptName == null \|\| _scriptName.Length == 0)`
	`90`	`+ Logger.Warn("Some assemblies failed to load. Launch with '-repl -loglevel debug' to see the details");`
	`91`	`+ else`
	`92`	`+ Logger.Warn("Some assemblies failed to load. Launch with '-loglevel debug' to see the details");`
	`93`	`+ }`
`86`	`94`	`builder.RegisterComposablePartCatalog(aggregateCatalog);`
`87`	`95`	`}`
`88`	`96`