diff --git a/Manager_WPF/MainWindow.xaml.cs b/Manager_WPF/MainWindow.xaml.cs
index c347b10e..b2e630f0 100644
--- a/Manager_WPF/MainWindow.xaml.cs
+++ b/Manager_WPF/MainWindow.xaml.cs
@@ -558,7 +558,7 @@ void OnChecked(object sender, RoutedEventArgs e)
}
catch (Exception ex)
{
- logging.AddToLog("Error enabling plugin: " + ex.Message, true);
+ logging.AddToLog("Error enabling plugin: " + ex.Message + " Inner Exception: " + ex.InnerException, true);
}
}
diff --git a/OSA.Service/OSAEService.cs b/OSA.Service/OSAEService.cs
index 7095f37d..cfa991a0 100644
--- a/OSA.Service/OSAEService.cs
+++ b/OSA.Service/OSAEService.cs
@@ -1,15 +1,20 @@
namespace OSAE.Service
{
+ #region Usings
+
using System;
using System.Collections.Generic;
using System.ServiceModel;
using System.ServiceProcess;
+ #endregion
+
///
/// The primary server used in the OSA infrastructure to process information
///
partial class OSAEService : ServiceBase
{
+ #region Member Variables
///
/// Used when generating messages to identify where the message came from
///
@@ -36,6 +41,8 @@ partial class OSAEService : ServiceBase
///
private System.Timers.Timer checkPlugins = new System.Timers.Timer();
+ #endregion
+
///
/// The Main Thread: This is where your Service is Run.
///
@@ -68,15 +75,16 @@ public OSAEService()
InitialiseOSAInEventLog();
// These Flags set whether or not to handle that specific
- // type of event. Set to true if you need it, false otherwise.
+ // type of event. Set to true if you need it, false otherwise.
this.CanStop = true;
this.CanShutdown = true;
- }
+ }
+
+ #region Standard Windows Service Methods
///
- /// OnStart: Put startup code here
- /// - Start threads, get inital data, etc.
+ /// The service control manager has requested us to start
///
///
protected override void OnStart(string[] args)
@@ -113,8 +121,7 @@ protected override void OnStart(string[] args)
}
///
- /// OnStop: Put your stop code here
- /// - Stop threads, set final data, etc.
+ /// The service control manager has requested us to stop
///
protected override void OnStop()
{
@@ -123,11 +130,16 @@ protected override void OnStop()
ShutDownSystems();
}
+ ///
+ /// The service control manager has requested us to shitdown
+ ///
protected override void OnShutdown()
{
logging.AddToLog("OnShutdown Invoked", false);
ShutDownSystems();
}
+
+ #endregion
}
}
diff --git a/WebUI/logs.aspx.cs b/WebUI/logs.aspx.cs
index c459827c..22220d15 100644
--- a/WebUI/logs.aspx.cs
+++ b/WebUI/logs.aspx.cs
@@ -3,8 +3,6 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using System.Web;
-using System.Web.UI;
using System.Web.UI.WebControls;
public partial class logs : System.Web.UI.Page
@@ -51,7 +49,6 @@ private void GetLogs()
var list = from f in fileList
select new { logName = Path.GetFileNameWithoutExtension(f) };
-
gvLogs.DataKeyNames = new string[] { "logName" };
gvLogs.DataSource = list;
@@ -65,9 +62,13 @@ protected void gvLogs_RowDataBound(object sender, System.Web.UI.WebControls.Grid
{
e.Row.Attributes.Add("onmouseover", "this.style.cursor='hand';this.style.background='lightblue';");
if (e.Row.RowState == DataControlRowState.Alternate)
+ {
e.Row.Attributes.Add("onmouseout", "this.style.background='#fcfcfc url(Images/grd_alt.png) repeat-x top';");
+ }
else
+ {
e.Row.Attributes.Add("onmouseout", "this.style.background='none';");
+ }
e.Row.Attributes.Add("onclick", ClientScript.GetPostBackClientHyperlink(this, "gvLogs_" + e.Row.RowIndex.ToString()));
}