Merge pull request #16 from ahwm/develop

Fix for #15

Author: ahwm

src/SvnManager.WebUI/Bootstrapper.cs

@@ -58,7 +58,8 @@ void OnConfigurationBuilder(NancyInternalConfiguration x)
         protected override void ConfigureApplicationContainer(TinyIoCContainer container)
         {
             base.ConfigureApplicationContainer(container);
-            ResourceViewLocationProvider.RootNamespaces.Add(Assembly.GetAssembly(typeof(RepositoriesModule)), "SvnManager.WebUI.Views");
+            if (!ResourceViewLocationProvider.RootNamespaces.ContainsKey(Assembly.GetAssembly(typeof(RepositoriesModule))))
+                ResourceViewLocationProvider.RootNamespaces.Add(Assembly.GetAssembly(typeof(RepositoriesModule)), "SvnManager.WebUI.Views");
         }
     }
 }

src/SvnManager.WebUI/NancyHostControl.cs

@@ -25,6 +25,7 @@ public void Stop()
         public void Dispose()
         {
             _host.Stop();
+            _host.Dispose();
         }
     }
 }

src/SvnManager/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
-//[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

src/SvnManager/SvnManagerService.cs

@@ -45,9 +45,16 @@ protected override void OnStart(string[] args)
         private void Monitor_Reloaded(object sender, EventArgs e)
         {
             EventLog.WriteEntry(Source, "Configuration Reloaded", EventLogEntryType.Information);
-            host.Stop();
-            host = new NancyHostControl(InterfaceUrlHost, InterfaceUrlPort, InterfaceUrlHttps);
-            host.Start();
+            host.Dispose();
+            try
+            {
+                host = new NancyHostControl(InterfaceUrlHost, InterfaceUrlPort, InterfaceUrlHttps);
+                host.Start();
+            }
+            catch (Exception ex)
+            {
+                EventLog.WriteEntry(Source, ex.Message + "\r\n\r\n" + ex.StackTrace, EventLogEntryType.Error);
+            }
         }
 
         private void _worker_DoWork(object sender, DoWorkEventArgs e)
@@ -72,7 +79,7 @@ private void _backupTimer_Elapsed(object sender, ElapsedEventArgs e)
 
         protected override void OnStop()
         {
-            host.Stop();
+            host.Dispose();
         }
     }
 }