[Slim-Checkins] r10559 - /branches/6.5/server/Slim/Schema/Storage.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Thu Nov  2 09:12:02 2006
New Revision: 10559

URL: http://svn.slimdevices.com?rev=10559&view=rev
Log:
Bug: N/A
Description: Merge from trunk -r 10557:10558

Modified:
    branches/6.5/server/Slim/Schema/Storage.pm

Modified: branches/6.5/server/Slim/Schema/Storage.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Schema/Storage.pm?rev=10559&r1=10558&r2=10559&view=diff
==============================================================================
--- branches/6.5/server/Slim/Schema/Storage.pm (original)
+++ branches/6.5/server/Slim/Schema/Storage.pm Thu Nov  2 09:12:02 2006
@@ -36,7 +36,7 @@
 
 			write_file($lockFile, 'starting');
 
-			logWarning("Unable to connect to the database - trying to bring it up!");
+			errorMsg("Unable to connect to the database - trying to bring it up!\n");
 
 			$@ = '';
 
@@ -45,14 +45,18 @@
 				eval { $self->ensure_connected };
 
 				if ($@) {
-					logError("Unable to connect to the database - even tried restarting it twice!");
-					logError("Check the event log for errors on Windows. Fatal. Exiting.");
+					errorMsg("Unable to connect to the database - even tried restarting it twice!\n");
+					errorMsg("Check the event log for errors on Windows. Fatal. Exiting.\n");
 					exit;
 				}
 			}
 
 			unlink($lockFile);
 		}
+
+	} elsif ($@) {
+
+		return $self->throw_exception($@);
 	}
 
 	return $self->_dbh;