[Slim-Checkins] r10928 - in /trunk/server: Slim/Web/HTTP.pm slimserver.pl

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sun Dec 10 03:39:03 2006
New Revision: 10928

URL: http://svn.slimdevices.com?rev=10928&view=rev
Log:
Bug: N/A
Description: split HTTP::init in two, so main init can be done before
plugin init, but delay opening port until server is full initialised

Modified:
    trunk/server/Slim/Web/HTTP.pm
    trunk/server/slimserver.pl

Modified: trunk/server/Slim/Web/HTTP.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/HTTP.pm?rev=10928&r1=10927&r2=10928&view=diff
==============================================================================
--- trunk/server/Slim/Web/HTTP.pm (original)
+++ trunk/server/Slim/Web/HTTP.pm Sun Dec 10 03:39:03 2006
@@ -134,8 +134,11 @@
 
 	# Initialize graphics resizing
 	Slim::Web::Graphics::init();
-
-	# if we've got an HTTP port specified, open it up!
+}
+
+sub init2 {
+	# open HTTP port if specified
+	# split into second init function so this can be performed after all server init is complete
 	if (Slim::Utils::Prefs::get('httpport')) {
 		Slim::Web::HTTP::openport(Slim::Utils::Prefs::get('httpport'), $::httpaddr, $Bin);
 	}

Modified: trunk/server/slimserver.pl
URL: http://svn.slimdevices.com/trunk/server/slimserver.pl?rev=10928&r1=10927&r2=10928&view=diff
==============================================================================
--- trunk/server/slimserver.pl (original)
+++ trunk/server/slimserver.pl Sun Dec 10 03:39:03 2006
@@ -343,6 +343,9 @@
 		Slim::Utils::UPnPMediaServer::init();
 	}
 
+	$log->info("SlimServer HTTP init...");
+	Slim::Web::HTTP::init();
+
 	$log->info("Source conversion init..");
 	Slim::Player::Source::init();
 
@@ -379,8 +382,8 @@
 
 	checkVersion();
 
-	$log->info("SlimServer HTTP init...");
-	Slim::Web::HTTP::init();
+	$log->info("SlimServer HTTP enable...");
+	Slim::Web::HTTP::init2();
 
 	# otherwise, get ready to loop
 	$lastlooptime = Time::HiRes::time();
@@ -441,8 +444,6 @@
 		}
 	}
 
-	# $log->debug("select_time: $select_time");
-
 	# call select and process any IO
 	Slim::Networking::Select::select($select_time);
 
@@ -469,8 +470,6 @@
 			$select_time = $timeout;
 		}
 	}
-
-	logger('server.timers')->debug("select_time: $select_time, checkTimers: $check_timers");
 
 	Slim::Networking::Select::select($select_time, 1);