Merge pull request rabbitmq#81 from seyfer/master

fix new task and worker files for second php-amqp tutorial

Author: videlalvaro

php-amqp/emit_log_direct.php

@@ -12,8 +12,7 @@
 $channel = new AMQPChannel($connection);
 
 
-$routing_key = $severity = $argv[1];
-if(empty($severity)) $severity = 'info';
+$routing_key = $severity = isset($argv[1]) && !empty($argv[1]) ? $argv[1] : 'info';
 
 $message = implode(' ',array_slice($argv, 2));
 if(empty($message)) $message = 'Hello World!';

php-amqp/emit_log_topic.php

@@ -12,7 +12,7 @@
 $channel = new AMQPChannel($connection);
 
 
-$routing_key = (isset($argv[1]))? $argv[1] : 'anonymous.info';
+$routing_key = isset($argv[1]) && !empty($argv[1]) ? $argv[1] : 'anonymous.info';
 
 $message = implode(' ',array_slice($argv, 2));
 if(empty($message)) $message = "Hello World!";
@@ -28,6 +28,6 @@
 
 	$exchange->publish($message, $routing_key);
 	echo " [x] Sent {$routing_key}:{$message}", PHP_EOL;
-} catch(Exception $ex) { 
+} catch(Exception $ex) {
 	print_r($ex);
 }

php-amqp/new_task.php

@@ -35,6 +35,6 @@
 $exchange = new AMQPExchange($channel);
 $exchange->publish($message, $routing_key);
 
-echo " [x] Sent {$data}", PHP_EOL;
+echo " [x] Sent {$message}", PHP_EOL;
 
 $connection->disconnect();

php-amqp/receive_logs.php

@@ -40,7 +40,7 @@
 	print_r($ex);
 } catch(AMQPExchangeException $ex) {
 	print_r($ex);
-} catch(AMQPChanncelException $ex) {
+} catch(AMQPChannelException $ex) {
 	print_r($ex);
 } catch(AMQPConnectionException $ex) {
 	print_r($ex);

php-amqp/worker.php

@@ -15,7 +15,7 @@
 
 $callback_func = function(AMQPEnvelope $message, AMQPQueue $q) use (&$max_jobs) {
 	echo " [x] Received: ", $message->getBody(), PHP_EOL;
-	sleep(1);
+	sleep(sleep(substr_count($message->getBody(), '.')));
 	echo " [X] Done", PHP_EOL;
 	$q->ack($message->getDeliveryTag());
 };

php/emit_log_direct.php

@@ -9,8 +9,7 @@
 
 $channel->exchange_declare('direct_logs', 'direct', false, false, false);
 
-$severity = $argv[1];
-if(empty($severity)) $severity = "info";
+$severity = isset($argv[1]) && !empty($argv[1]) ? $argv[1] : 'info';
 
 $data = implode(' ', array_slice($argv, 2));
 if(empty($data)) $data = "Hello World!";

php/emit_log_topic.php

@@ -10,8 +10,7 @@
 
 $channel->exchange_declare('topic_logs', 'topic', false, false, false);
 
-$routing_key = $argv[1];
-if(empty($routing_key)) $routing_key = "anonymous.info";
+$routing_key = isset($argv[1]) && !empty($argv[1]) ? $argv[1] : 'anonymous.info';
 $data = implode(' ', array_slice($argv, 2));
 if(empty($data)) $data = "Hello World!";