[Slim-Checkins] r12602 - in /trunk/server/Slim/Web: Cometd.pm HTTP.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Sat Aug 18 15:15:00 2007
New Revision: 12602

URL: http://svn.slimdevices.com?rev=12602&view=rev
Log:
Drop Data::UUID dep

Modified:
    trunk/server/Slim/Web/Cometd.pm
    trunk/server/Slim/Web/HTTP.pm

Modified: trunk/server/Slim/Web/Cometd.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Cometd.pm?rev=12602&r1=12601&r2=12602&view=diff
==============================================================================
--- trunk/server/Slim/Web/Cometd.pm (original)
+++ trunk/server/Slim/Web/Cometd.pm Sat Aug 18 15:15:00 2007
@@ -19,7 +19,6 @@
 use strict;
 
 use bytes;
-use Data::UUID;
 use Digest::SHA1 qw(sha1_hex);
 use HTTP::Date;
 use JSON::XS qw(to_json from_json);
@@ -30,11 +29,10 @@
 use Slim::Web::Cometd::Manager;
 use Slim::Web::HTTP;
 use Slim::Utils::Log;
+use Slim::Utils::Network;
 use Slim::Utils::Timers;
 
 my $log = logger('network.cometd');
-
-my $uuid = Data::UUID->new;
 
 my $manager = Slim::Web::Cometd::Manager->new;
 
@@ -141,7 +139,7 @@
 				$clid = $obj->{clientId};
 			}
 			elsif ( $obj->{channel} eq '/meta/handshake' ) {
-				$clid = lc( $uuid->create_hex );
+				$clid = new_uuid();
 				$manager->register_clid( $clid );
 			}
 			else {
@@ -339,7 +337,7 @@
 			
 			# A non-subscription request
 			my $request = $obj->{data};
-			my $id      = $obj->{id} || lc( $uuid->create_hex ); # unique id for this request
+			my $id      = $obj->{id} || new_uuid(); # unique id for this request
 			
 			if ( $request && $id ) {
 				my $result = handleRequest( $clid, $request, $obj->{channel}, $id );
@@ -564,4 +562,9 @@
 	}
 }
 
+# Create a new UUID
+sub new_uuid {
+	return sha1_hex( Time::HiRes::time() . $$ . Slim::Utils::Network::hostName() );
+}
+
 1;

Modified: trunk/server/Slim/Web/HTTP.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/HTTP.pm?rev=12602&r1=12601&r2=12602&view=diff
==============================================================================
--- trunk/server/Slim/Web/HTTP.pm (original)
+++ trunk/server/Slim/Web/HTTP.pm Sat Aug 18 15:15:00 2007
@@ -45,7 +45,7 @@
 use Slim::Web::Pages;
 use Slim::Web::Graphics;
 use Slim::Web::JSONRPC;
-#use Slim::Web::Cometd;
+use Slim::Web::Cometd;
 use Slim::Utils::Prefs;
 
 BEGIN {
@@ -156,7 +156,7 @@
 	Slim::Web::JSONRPC::init();
 	
 	# Initialize Cometd
-	#Slim::Web::Cometd::init();
+	Slim::Web::Cometd::init();
 }
 
 sub init2 {