Merge lp:~cszikszoy/docky/logging into lp:docky

[Chris S.]

[Chris S. (cszikszoy)]

add logging service and clean up all Console.WriteLines

[Jason Smith (jassmith)]

+1 merge away

review: Approve

=== modified file 'Docky.Services/Docky.Services.csproj'
--- Docky.Services/Docky.Services.csproj	2009-10-07 10:22:01 +0000
+++ Docky.Services/Docky.Services.csproj	2009-10-08 01:25:18 +0000
@@ -80,9 +80,15 @@
     <Compile Include="Docky.Services\Preferences.cs" />
     <Compile Include="Docky.Services\NotificationService.cs" />
     <Compile Include="Docky.Services\ConnectionStatusChangeEventArgs.cs" />
+    <Compile Include="Docky.Services\Logging\LogBase.cs" />
+    <Compile Include="Docky.Services\Logging\ConsoleCrayon.cs" />
+    <Compile Include="Docky.Services\LogTSender.cs" />
+    <Compile Include="Docky.Services\Log.cs" />
+    <Compile Include="Docky.Services\Logging\ConsoleLog.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Folder Include="Docky.Services\" />
+    <Folder Include="Docky.Services\Logging\" />
   </ItemGroup>
 </Project>

=== modified file 'Docky.Services/Docky.Services/DockServices.cs'
--- Docky.Services/Docky.Services/DockServices.cs	2009-09-25 06:14:39 +0000
+++ Docky.Services/Docky.Services/DockServices.cs	2009-10-08 01:25:18 +0000
@@ -21,7 +21,7 @@
 {
 
 
-	public static class DockServices
+	public class DockServices
 	{
 		public static DrawingService Drawing { get; private set; }
 		
@@ -31,12 +31,18 @@
 		
 		public static NotificationService Notifications { get; private set; }
 		
+		public DockServices ()
+		{
+		}
+		
 		static DockServices ()
 		{
 			Drawing       = new DrawingService ();
 			Preferences   = new PreferencesService ();
 			System        = new SystemService ();
 			Notifications = new NotificationService ();
+			
+			Log<DockServices>.Info ("Dock services initialized.");
 		}
 	}
 }

=== added file 'Docky.Services/Docky.Services/Log.cs'
--- Docky.Services/Docky.Services/Log.cs	1970-01-01 00:00:00 +0000
+++ Docky.Services/Docky.Services/Log.cs	2009-10-08 01:25:18 +0000
@@ -0,0 +1,59 @@
+//  
+//  Copyright (C) 2009 Jason Smith
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+
+namespace Docky.Services
+{
+	
+	public enum LogLevel {
+		Debug,
+		Info,
+		Warn,
+		Error,
+		Fatal,
+	}	
+
+	public class Log : Logging.LogBase
+	{
+
+		public static void Debug (string msg, params object [] args)
+		{
+			Write (LogLevel.Debug, msg, args);
+		}
+		
+		public static void Info (string msg, params object [] args)
+		{
+			Write (LogLevel.Info, msg, args);
+		}
+		
+		public static void Warn (string msg, params object [] args)
+		{
+			Write (LogLevel.Warn, msg, args);
+		}
+		
+		public static void Error (string msg, params object [] args)
+		{
+			Write (LogLevel.Error, msg, args);
+		}
+		
+		public static void Fatal (string msg, params object [] args)
+		{
+			Write (LogLevel.Fatal, msg, args);
+		}
+	}
+}

=== added file 'Docky.Services/Docky.Services/LogTSender.cs'
--- Docky.Services/Docky.Services/LogTSender.cs	1970-01-01 00:00:00 +0000
+++ Docky.Services/Docky.Services/LogTSender.cs	2009-10-08 01:25:18 +0000
@@ -0,0 +1,58 @@
+//  
+//  Copyright (C) 2009 Jason Smith
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+
+namespace Docky.Services
+{
+	
+	public class Log<TSender> : Logging.LogBase
+	{
+
+		const string SenderFormat = "[{0}] {1}";
+
+		static string AddSender (string message)
+		{
+			return string.Format (SenderFormat, typeof (TSender).Name, message);
+		}
+
+		public static void Debug (string msg, params object [] args)
+		{
+			Write (LogLevel.Debug, AddSender (msg), args);
+		}
+		
+		public static void Info (string msg, params object [] args)
+		{
+			Write (LogLevel.Info, AddSender (msg), args);
+		}
+		
+		public static void Warn (string msg, params object [] args)
+		{
+			Write (LogLevel.Warn, AddSender (msg), args);
+		}
+		
+		public static void Error (string msg, params object [] args)
+		{
+			Write (LogLevel.Error, AddSender (msg), args);
+		}
+		
+		public static void Fatal (string msg, params object [] args)
+		{
+			Write (LogLevel.Fatal, AddSender (msg), args);
+		}
+	}
+}

=== added directory 'Docky.Services/Docky.Services/Logging'
=== added file 'Docky.Services/Docky.Services/Logging/ConsoleCrayon.cs'
--- Docky.Services/Docky.Services/Logging/ConsoleCrayon.cs	1970-01-01 00:00:00 +0000
+++ Docky.Services/Docky.Services/Logging/ConsoleCrayon.cs	2009-10-08 01:25:18 +0000
@@ -0,0 +1,197 @@
+// ConsoleCrayon.cs
+//
+// Author:
+//   Aaron Bockover <[e-mail]>
+//
+// Copyright (C) 2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace Docky.Services.Logging
+{
+	internal static class ConsoleCrayon
+	{
+
+#region Public API
+
+		private static ConsoleColor foreground_color;
+		public static ConsoleColor ForegroundColor {
+			get { return foreground_color; }
+			set {
+				foreground_color = value;
+				SetColor (foreground_color, true);
+			}
+		}
+
+		private static ConsoleColor background_color;
+		public static ConsoleColor BackgroundColor {
+			get { return background_color; }
+			set {
+				background_color = value;
+				SetColor (background_color, false);
+			}
+		}
+
+		public static void ResetColor ()
+		{
+			if (XtermColors) {
+				Console.Write (GetAnsiResetControlCode ());
+			} else if (Environment.OSVersion.Platform != PlatformID.Unix &&
+						!RuntimeIsMono) {
+				Console.ResetColor ();
+			}
+		}
+
+		private static void SetColor (ConsoleColor color, bool isForeground)
+		{
+			if (color < ConsoleColor.Black || color > ConsoleColor.White) {
+				throw new ArgumentOutOfRangeException ("color",
+					"Not a ConsoleColor value.");
+			}
+
+			if (XtermColors) {
+				Console.Write (GetAnsiColorControlCode (color, isForeground));
+			} else if (Environment.OSVersion.Platform != PlatformID.Unix &&
+						!RuntimeIsMono) {
+				if (isForeground) {
+					Console.ForegroundColor = color;
+				} else {
+					Console.BackgroundColor = color;
+				}
+			}
+		}
+
+#endregion
+
+#region Ansi/VT Code Calculation
+
+		// Modified from Mono's System.TermInfoDriver
+		// License: MIT/X11
+		// Authors: Gonzalo Paniagua Javier <[e-mail]>
+		// (C) 2005-2006 Novell, Inc <http://www.novell.com>
+
+		private static int TranslateColor (ConsoleColor desired, out bool light)
+		{
+			light = false;
+			switch (desired) {
+				// Dark colors
+				case ConsoleColor.Black: return 0;
+				case ConsoleColor.DarkRed: return 1;
+				case ConsoleColor.DarkGreen: return 2;
+				case ConsoleColor.DarkYellow: return 3;
+				case ConsoleColor.DarkBlue: return 4;
+				case ConsoleColor.DarkMagenta: return 5;
+				case ConsoleColor.DarkCyan: return 6;
+				case ConsoleColor.Gray: return 7;
+
+										// Light colors
+				case ConsoleColor.DarkGray: light = true; return 0;
+				case ConsoleColor.Red: light = true; return 1;
+				case ConsoleColor.Green: light = true; return 2;
+				case ConsoleColor.Yellow: light = true; return 3;
+				case ConsoleColor.Blue: light = true; return 4;
+				case ConsoleColor.Magenta: light = true; return 5;
+				case ConsoleColor.Cyan: light = true; return 6;
+				case ConsoleColor.White: default: light = true; return 7;
+			}
+		}
+
+		private static string GetAnsiColorControlCode (ConsoleColor color, bool isForeground)
+		{
+			// lighter fg colours are 90 -> 97 rather than 30 -> 37
+			// lighter bg colours are 100 -> 107 rather than 40 -> 47
+			bool light;
+			int code = TranslateColor (color, out light) + (isForeground ? 30 : 40) + (light ? 60 : 0);
+			return String.Format ("\x001b[{0}m", code);
+		}
+
+		private static string GetAnsiResetControlCode ()
+		{
+			return "\x001b[0m";
+		}
+
+#endregion
+
+#region xterm Detection
+
+		private static bool? xterm_colors = null;
+		public static bool XtermColors { 
+			get {
+				if (xterm_colors == null) {
+					DetectXtermColors ();
+				}
+
+				return xterm_colors.Value;
+			}
+		}
+
+		[System.Runtime.InteropServices.DllImport ("libc", EntryPoint="isatty")]
+			private extern static int _isatty (int fd);
+
+		private static bool isatty (int fd)
+		{
+			try {
+				return _isatty (fd) == 1;
+			} catch {
+				return false;
+			}
+		}
+
+		private static void DetectXtermColors ()
+		{
+			bool _xterm_colors = false;
+
+			switch (Environment.GetEnvironmentVariable ("TERM")) {
+				case "xterm":
+					case "rxvt":
+					case "rxvt-unicode": 
+					if (Environment.GetEnvironmentVariable ("COLORTERM") != null) {
+						_xterm_colors = true;
+					}
+				break;
+				case "xterm-color":
+					_xterm_colors = true;
+				break;
+			}
+
+			xterm_colors = _xterm_colors && isatty (1) && isatty (2);
+		}
+
+#endregion
+
+#region Runtime Detection
+
+		private static bool? runtime_is_mono;
+		public static bool RuntimeIsMono {
+			get { 
+				if (runtime_is_mono == null) {
+					runtime_is_mono = Type.GetType ("System.MonoType") != null;
+				}
+
+				return runtime_is_mono.Value;
+			}
+		}
+
+#endregion
+	}
+}

=== added file 'Docky.Services/Docky.Services/Logging/ConsoleLog.cs'
--- Docky.Services/Docky.Services/Logging/ConsoleLog.cs	1970-01-01 00:00:00 +0000
+++ Docky.Services/Docky.Services/Logging/ConsoleLog.cs	2009-10-08 01:25:18 +0000
@@ -0,0 +1,84 @@
+//  
+//  Copyright (C) 2009 Jason Smith
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+
+namespace Docky.Services.Logging
+{
+
+
+	internal static class ConsoleLog
+	{
+		/// <value>
+		/// A string to make printing the current time simpler
+		/// </value>
+		const string TimeFormat = "{0:00}:{1:00}:{2:00}.{3:000}";
+		
+		/// <value>
+		/// A consistent way of printing [Time LogLevel]
+		/// </value>
+		const string LogFormat = "[{0,-5} {1}]";
+		
+		/// <value>
+		/// the current time using the TimeFormat format.
+		/// </value>
+		static string Time {
+			get {
+				DateTime now = DateTime.Now;
+				return string.Format (TimeFormat, now.Hour, now.Minute, now.Second, now.Millisecond);
+			}
+		}
+
+		static string FormatLogPrompt (LogLevel level)
+		{
+			string levelString = Enum.GetName (typeof (LogLevel), level);
+			return string.Format (LogFormat, levelString, Time);
+		}
+		
+		static string FormatLogMessage (LogLevel level, string message)
+		{
+			return string.Format ("{0} {1}", FormatLogPrompt (level), message);
+		}
+		
+		public static void Log (LogLevel level, string message)
+		{
+			switch (level) {
+			case LogLevel.Fatal:
+				ConsoleCrayon.BackgroundColor = ConsoleColor.Red;
+				ConsoleCrayon.ForegroundColor = ConsoleColor.White;
+				break;
+			case LogLevel.Error:
+				ConsoleCrayon.ForegroundColor = ConsoleColor.Red;
+				break;
+			case LogLevel.Warn:
+				ConsoleCrayon.ForegroundColor = ConsoleColor.Yellow;
+				break;
+			case LogLevel.Info:
+				ConsoleCrayon.ForegroundColor = ConsoleColor.Blue;
+				break;
+			case LogLevel.Debug:
+				ConsoleCrayon.ForegroundColor = ConsoleColor.Green;
+				break;
+			}
+			Console.Write (FormatLogPrompt (level));
+			ConsoleCrayon.ResetColor ();
+			
+			Console.Write (" ");
+			Console.WriteLine (message);
+		}		
+	}
+}

=== added file 'Docky.Services/Docky.Services/Logging/LogBase.cs'
--- Docky.Services/Docky.Services/Logging/LogBase.cs	1970-01-01 00:00:00 +0000
+++ Docky.Services/Docky.Services/Logging/LogBase.cs	2009-10-08 01:25:19 +0000
@@ -0,0 +1,81 @@
+//  
+//  Copyright (C) 2009 Jason Smith
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace Docky.Services.Logging
+{
+	
+	public abstract class LogBase
+	{
+		class LogCall
+		{
+			public readonly LogLevel Level;
+			public readonly string Message;
+
+			public LogCall (LogLevel level, string message)
+			{
+				Level = level;
+				Message = message;
+			}
+		}
+
+		public static LogLevel DisplayLevel { get; set; }
+
+		static bool Writing { get; set; }
+		static ICollection<LogCall> PendingLogCalls { get; set; }
+
+		static LogBase ()
+		{
+			Writing = false;
+			PendingLogCalls = new LinkedList<LogCall> ();
+		}
+
+		public static void Write (LogLevel level, string msg, params object[] args)
+		{
+			if (level < DisplayLevel) return;
+			
+			msg = string.Format (msg, args);
+			if (Writing) {
+				// In the process of logging, another log call has been made.
+				// We need to avoid the infinite regress this may cause.
+				PendingLogCalls.Add (new LogCall (level, msg));
+			} else {
+				Writing = true;
+
+				if (PendingLogCalls.Any ()) {
+					// Flush delayed log calls.
+					// First, swap PendingLogCalls with an empty collection so it
+					// is not modified while we enumerate.
+					IEnumerable<LogCall> calls = PendingLogCalls;
+					PendingLogCalls = new LinkedList<LogCall> ();
+	
+					// Log all pending calls.
+					foreach (LogCall call in calls)
+							ConsoleLog.Log (call.Level, call.Message);
+				}
+
+				// Log message.
+				ConsoleLog.Log (level, msg);
+				
+				Writing = false;
+			}
+		}
+	}
+}

=== modified file 'Docky.Services/Docky.Services/Preferences.cs'
--- Docky.Services/Docky.Services/Preferences.cs	2009-10-07 03:35:14 +0000
+++ Docky.Services/Docky.Services/Preferences.cs	2009-10-08 01:25:18 +0000
@@ -44,12 +44,12 @@
 			try {
 				result = client.Get (AbsolutePathForKey (key, GConfPrefix));
 			} catch (GConf.NoSuchKeyException e) {
-				Console.Error.WriteLine (e.Message);
+				Log.Debug ("Key {0} does not exist, creating.", key);
 				Set<T> (key, def);
 				return def;
 			} catch (Exception e) {
-				Console.Error.WriteLine (e.Message);
-				Console.Error.WriteLine (e.StackTrace);
+				Log.Error ("Failed to get gconf value for {0} : '{1}'", key, e.Message);
+				Log.Info (e.StackTrace);
 				return def;
 			}
 			
@@ -65,8 +65,8 @@
 			try {
 				client.Set (AbsolutePathForKey (key, GConfPrefix), val);
 			} catch (Exception e) {
-				Console.Error.WriteLine ("Encountered error setting GConf key {0}: {1}", key, e.Message);
-				Console.Error.WriteLine (e.StackTrace);
+				Log.Error ("Encountered error setting GConf key {0}: '{1}'", key, e.Message);
+				Log.Info (e.StackTrace);
 				success = false;
 			}
 			return success;
@@ -83,11 +83,11 @@
 		
 		#region IPreferences - secure, based on Gnome Keyring
 		
-		//readonly string ErrorSavingMessage = Catalog.GetString ("Error saving {0}");
-		//readonly string KeyNotFoundMessage = Catalog.GetString ("Key \"{0}\" not found in keyring");
-		//readonly string KeyringUnavailableMessage = Catalog.GetString ("gnome-keyring-daemon could not be reached!");
+		readonly string ErrorSavingMessage = "Error saving {0} : '{0}'";
+		readonly string KeyNotFoundMessage = "Key \"{0}\" not found in keyring";
+		readonly string KeyringUnavailableMessage = "gnome-keyring-daemon could not be reached!";
 		
-		const string DefaultRootPath = "gnome-do";
+		const string DefaultRootPath = "docky";
 
 		public bool SetSecure<T> (string key, T val)
 		{
@@ -97,7 +97,7 @@
 			Hashtable keyData;
 			
 			if (!Ring.Available) {
-				//Log.Error (KeyringUnavailableMessage);
+				Log.Error (KeyringUnavailableMessage);
 				return false;
 			}
 
@@ -106,9 +106,9 @@
 			
 			try {
 				Ring.CreateItem (Ring.GetDefaultKeyring (), ItemType.GenericSecret, AbsolutePathForKey (key, DefaultRootPath), keyData, val.ToString (), true);
-			} catch /*(KeyringException e)*/ {
-				//Log.Error (ErrorSavingMessage, key, e.Message);
-				//Log.Debug (e.StackTrace);
+			} catch (KeyringException e) {
+				Log.Error (ErrorSavingMessage, key, e.Message);
+				Log.Info (e.StackTrace);
 				return false;
 			}
 
@@ -120,7 +120,7 @@
 			Hashtable keyData;
 			
 			if (!Ring.Available) {
-				//Log.Error (KeyringUnavailableMessage);
+				Log.Error (KeyringUnavailableMessage);
 				return def;
 			}
 
@@ -135,7 +135,7 @@
 					return (T) Convert.ChangeType (secureValue, typeof (T));
 				}
 			} catch (KeyringException) {
-				//Log.Debug (KeyNotFoundMessage, AbsolutePathForKey (key));
+				Log.Error (KeyNotFoundMessage, AbsolutePathForKey (key, DefaultRootPath));
 			}
 
 			return def;

=== modified file 'Docky.Services/Docky.Services/SystemService.cs'
--- Docky.Services/Docky.Services/SystemService.cs	2009-10-07 17:48:01 +0000
+++ Docky.Services/Docky.Services/SystemService.cs	2009-10-08 01:25:18 +0000
@@ -43,11 +43,10 @@
 					network.StateChanged += OnConnectionStatusChanged;
 					SetConnected ();
 				}
-			} catch /*(Exception e)*/ {
+			} catch (Exception e) {
 				// if something bad happened, log the error and assume we are connected
-				// FIXME: use proper logging
-				//Log<NetworkService>.Error ("Could not initialize Network Manager dbus: {0}", e.Message);
-				//Log<NetworkService>.Debug (e.StackTrace);
+				Log<SystemService>.Error ("Could not initialize Network Manager dbus: '{0}'", e.Message);
+				Log<SystemService>.Info (e.StackTrace);
 				NetworkConnected = true;
 			}
 		}		
@@ -149,16 +148,16 @@
 					devicekit = Bus.System.GetObject<IDeviceKitPower> (DeviceKitPowerName, new ObjectPath (DeviceKitPowerPath));
 					devicekit.OnChanged += DeviceKitOnChanged;
 					on_battery = (bool) devicekit.Get (DeviceKitPowerName, "on-battery");
-					//Log<SystemService>.Debug ("Using org.freedesktop.DeviceKit.Power for battery information");
+					Log<SystemService>.Debug ("Using org.freedesktop.DeviceKit.Power for battery information");
 				} else if (Bus.Session.NameHasOwner (PowerManagementName)) {
 					power = Bus.Session.GetObject<IPowerManagement> (PowerManagementName, new ObjectPath (PowerManagementPath));
 					power.OnBatteryChanged += PowerOnBatteryChanged;
 					on_battery = power.GetOnBattery ();
-					//Log<SystemService>.Debug ("Using org.freedesktop.PowerManager for battery information");
+					Log<SystemService>.Debug ("Using org.freedesktop.PowerManager for battery information");
 				}
-			} catch /*(Exception e)*/ {
-				//Log<SystemService>.Error ("Could not initialize dbus: {0}", e.Message);
-				//Log<SystemService>.Debug (e.StackTrace);
+			} catch (Exception e) {
+				Log<SystemService>.Error ("Could not initialize power manager dbus: '{0}'", e.Message);
+				Log<SystemService>.Info (e.StackTrace);
 			}
 		}
 

=== modified file 'Docky.Services/Makefile.am'
--- Docky.Services/Makefile.am	2009-10-07 10:22:01 +0000
+++ Docky.Services/Makefile.am	2009-10-08 01:25:18 +0000
@@ -7,6 +7,11 @@
 PKG_CONFIG_FILES = docky.services.pc
 
 FILES = \
+	Docky.Services/Logging/ConsoleCrayon.cs \
+	Docky.Services/Logging/LogBase.cs \
+	Docky.Services/Logging/ConsoleLog.cs \
+	Docky.Services/Log.cs \
+	Docky.Services/LogTSender.cs \
 	Docky.Services/ConnectionStatusChangeEventArgs.cs \
     Docky.Services/IPreferences.cs \
     Docky.Services/PreferencesService.cs \

=== modified file 'Docky.StandardPlugins/RemovableDevices/VolumeProvider.cs'
--- Docky.StandardPlugins/RemovableDevices/VolumeProvider.cs	2009-10-07 00:49:24 +0000
+++ Docky.StandardPlugins/RemovableDevices/VolumeProvider.cs	2009-10-08 01:25:19 +0000
@@ -22,6 +22,7 @@
 using Gnome.Vfs;
 
 using Docky.Items;
+using Docky.Services;
 
 namespace RemovableDevices
 {
@@ -61,6 +62,7 @@
 		
 		public VolumeProvider ()
 		{
+
 			Computer = new ComputerItem ();
 			
 			// initialize VFS in case it isn't already
@@ -73,7 +75,6 @@
 
 			foreach (Volume v in Monitor.MountedVolumes) {
 				if (v.IsUserVisible) {
-					// Console.WriteLine ("adding {0}", v.DisplayName);
 					Volumes.Add ( new VolumeItem (v));
 				}
 			}
@@ -85,7 +86,7 @@
 		void HandleVolumeUnmounted(object o, VolumeUnmountedArgs args)
 		{
 			if (Volumes.Any ( d => d.VfsVolume == args.Volume)) {
-				// Console.WriteLine ("Removing {0}", args.Volume.DisplayName);
+				Log<VolumeProvider>.Info ("{0} unmounted.", args.Volume.DisplayName);
 				VolumeItem volToRemove = Volumes.First ( d => d.VfsVolume == args.Volume);
 				Volumes.Remove (volToRemove);
 				OnItemsChanged (null, (volToRemove as AbstractDockItem).AsSingle ());
@@ -95,7 +96,7 @@
 
 		void HandleVolumeMounted(object o, VolumeMountedArgs args)
 		{
-			// Console.WriteLine ("Adding {0}", args.Volume.DisplayName);
+			Log<VolumeProvider>.Info ("{0} mounted.", args.Volume.DisplayName);
 			VolumeItem newVol = new VolumeItem (args.Volume);
 			Volumes.Add (newVol);
 			OnItemsChanged ((newVol as AbstractDockItem).AsSingle (), null);

=== modified file 'Docky.StandardPlugins/Trash/TrashDockItem.cs'
--- Docky.StandardPlugins/Trash/TrashDockItem.cs	2009-10-07 03:35:14 +0000
+++ Docky.StandardPlugins/Trash/TrashDockItem.cs	2009-10-08 01:25:19 +0000
@@ -149,9 +149,8 @@
 		{
 			try {
 				DockServices.System.Execute (string.Format ("gvfs-trash \"{0}\"", item));
-			} catch /*(Exception e)*/ { 
-//				Log.Error (e.Message);
-//				Log.Error ("Could not move {0} to trash", item); 
+			} catch (Exception e) { 
+				Log<TrashDockItem>.Error ("Could not move {0} to trash: '{1}'", item, e.Message);
 				return false;
 			}
 			

=== modified file 'Docky.Zeitgeist/Docky.Zeitgeist.csproj'
--- Docky.Zeitgeist/Docky.Zeitgeist.csproj	2009-10-04 01:02:32 +0000
+++ Docky.Zeitgeist/Docky.Zeitgeist.csproj	2009-10-08 01:25:19 +0000
@@ -49,4 +49,10 @@
     <Compile Include="Zeitgeist\ZeitgeistFilter.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\Docky.Services\Docky.Services.csproj">
+      <Project>{8A6E0EDD-6443-4F99-9EAC-D9CC906F080D}</Project>
+      <Name>Docky.Services</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file

=== modified file 'Docky.Zeitgeist/Makefile.am'
--- Docky.Zeitgeist/Makefile.am	2009-10-04 01:02:32 +0000
+++ Docky.Zeitgeist/Makefile.am	2009-10-08 01:25:19 +0000
@@ -9,6 +9,9 @@
 	Zeitgeist/ZeitgeistFilter.cs \
 	Zeitgeist/ZeitgeistProxy.cs
 
+PROJECT_REFERENCES = \
+	Docky.Services
+
 REFERENCES =  \
 	System \
 	System.Core \

=== modified file 'Docky.Zeitgeist/Zeitgeist/ZeitgeistProxy.cs'
--- Docky.Zeitgeist/Zeitgeist/ZeitgeistProxy.cs	2009-10-07 18:28:20 +0000
+++ Docky.Zeitgeist/Zeitgeist/ZeitgeistProxy.cs	2009-10-08 01:25:19 +0000
@@ -24,6 +24,8 @@
 using NDesk.DBus;
 using org.freedesktop.DBus;
 
+using Docky.Services;
+
 namespace Docky.Zeitgeist
 {
 
@@ -65,8 +67,7 @@
 				if (reply == StartReply.AlreadyRunning || reply == StartReply.Success)
 					zeitgeist = Bus.Session.GetObject<IZeitgeistDaemon> (BusName, new ObjectPath (PathName));
 			} catch (Exception e) {
-				Console.Error.WriteLine (e.Message);
-				Console.Error.WriteLine ("Failed to connect to zeitgeist bus");
+				Log<ZeitgeistProxy>.Error ("Failed to connect to zeitgeist bus : '{0}'", e.Message);
 			}
 		}
 		
@@ -95,7 +96,8 @@
 				results = zeitgeist.FindEvents (startTime, stopTime, maxResults, ascending, 
 					                            mode, filters.Select (f => f.ToDBusFilter ()).ToArray ());
 			} catch (Exception e) {
-				Console.WriteLine (e.Message);
+				Log<ZeitgeistProxy>.Error ("Failed to find Zeitgeist events: '{0}'", e.Message);
+				Log<ZeitgeistProxy>.Info (e.StackTrace);
 				yield break;
 			}
 			

=== modified file 'Docky/Docky/Docky.cs'
--- Docky/Docky/Docky.cs	2009-10-06 21:16:26 +0000
+++ Docky/Docky/Docky.cs	2009-10-08 01:25:18 +0000
@@ -28,6 +28,7 @@
 using Gtk;
 
 using Docky.Windowing;
+using Docky.Services;
 
 namespace Docky
 {
@@ -71,6 +72,9 @@
 			PluginManager.Initialize ();
 			Controller.Initialize ();
 			
+			//FIXME: parse args to set log level
+			Log.DisplayLevel = LogLevel.Debug;
+			
 			Gdk.Threads.Enter ();
 			Gtk.Application.Run ();
 			Gdk.Threads.Leave ();
@@ -89,7 +93,8 @@
 			about.Comments = "Docky. Simply Powerful.";
 			about.Authors = new[] {
 				"Jason Smith",
-				"Robert Dyer"
+				"Robert Dyer",
+				"Chris Szikszoy"
 			};
 			
 			about.ShowAll ();

=== modified file 'Docky/Docky/Interface/AutohideManager.cs'
--- Docky/Docky/Interface/AutohideManager.cs	2009-09-23 04:38:35 +0000
+++ Docky/Docky/Interface/AutohideManager.cs	2009-10-08 01:25:18 +0000
@@ -26,6 +26,8 @@
 using Gtk;
 using Wnck;
 
+using Docky.Services;
+
 namespace Docky.Interface
 {
 
@@ -193,7 +195,8 @@
 					                    w.Pid != pid &&
 					                    w.EasyGeometry ().IntersectsWith (adjustedDockArea));
 			} catch (Exception e) {
-				Console.WriteLine (e.Message);
+				Log<AutohideManager>.Error ("Failed to update window intersect: '{0}'", e.Message);
+				Log<AutohideManager>.Info (e.StackTrace);
 			}
 			
 			if (WindowIntersectingOther != intersect) {

=== modified file 'Docky/gtk-gui/gui.stetic'
--- Docky/gtk-gui/gui.stetic	2009-10-06 22:36:51 +0000
+++ Docky/gtk-gui/gui.stetic	2009-10-08 01:25:18 +0000
@@ -10,8 +10,8 @@
     <widget-library name="../../Docky.Services/bin/Debug/Docky.Services.dll" />
     <widget-library name="../../Docky.Items/bin/Debug/Docky.Items.dll" />
     <widget-library name="../../Docky.Windowing/bin/Debug/Docky.Windowing.dll" />
+    <widget-library name="../../Docky.StandardPlugins/bin/Debug/Docky.StandardPlugins.dll" />
     <widget-library name="../bin/Debug/Docky.exe" internal="true" />
-    <widget-library name="../../Docky.StandardPlugins/bin/Debug/Docky.StandardPlugins.dll" />
   </import>
   <widget class="Gtk.Bin" id="Docky.Interface.DockPreferences" design-size="368 331">
     <property name="MemberName" />