Merge pull request #116 from clue-labs/errors

Improve error reporting, include Redis URI and socket error codes in all connection errors

README.md

@@ -61,8 +61,8 @@ local Redis server and send some requests:
 
 ```php
 $factory = new Clue\React\Redis\Factory();
+$client = $factory->createLazyClient('localhost:6379');
 
-$client = $factory->createLazyClient('localhost');
 $client->set('greeting', 'Hello world');
 $client->append('greeting', '!');
 
@@ -118,14 +118,14 @@ $factory = new Clue\React\Redis\Factory(null, $connector);
 
 #### createClient()
 
-The `createClient(string $redisUri): PromiseInterface<Client,Exception>` method can be used to
+The `createClient(string $uri): PromiseInterface<Client,Exception>` method can be used to
 create a new [`Client`](#client).
 
 It helps with establishing a plain TCP/IP or secure TLS connection to Redis
 and optionally authenticating (AUTH) and selecting the right database (SELECT).
 
 ```php
-$factory->createClient('redis://localhost:6379')->then(
+$factory->createClient('localhost:6379')->then(
     function (Client $client) {
         // client connected (and authenticated)
     },
@@ -146,7 +146,7 @@ reject its value with an Exception and will cancel the underlying TCP/IP
 connection attempt and/or Redis authentication.
 
 ```php
-$promise = $factory->createClient($redisUri);
+$promise = $factory->createClient($uri);
 
 Loop::addTimer(3.0, function () use ($promise) {
     $promise->cancel();
@@ -215,14 +215,14 @@ $factory->createClient('localhost?timeout=0.5');
 
 #### createLazyClient()
 
-The `createLazyClient(string $redisUri): Client` method can be used to
+The `createLazyClient(string $uri): Client` method can be used to
 create a new [`Client`](#client).
 
 It helps with establishing a plain TCP/IP or secure TLS connection to Redis
 and optionally authenticating (AUTH) and selecting the right database (SELECT).
 
 ```php
-$client = $factory->createLazyClient('redis://localhost:6379');
+$client = $factory->createLazyClient('localhost:6379');
 
 $client->incr('hello');
 $client->end();

examples/cli.php

@@ -1,5 +1,8 @@
 <?php
 
+// $ php examples/cli.php
+// $ REDIS_URI=localhost:6379 php examples/cli.php
+
 use Clue\React\Redis\Client;
 use Clue\React\Redis\Factory;
 use React\EventLoop\Loop;
@@ -11,7 +14,7 @@
 
 echo '# connecting to redis...' . PHP_EOL;
 
-$factory->createClient('localhost')->then(function (Client $client) {
+$factory->createClient(getenv('REDIS_URI') ?: 'localhost:6379')->then(function (Client $client) {
     echo '# connected! Entering interactive mode, hit CTRL-D to quit' . PHP_EOL;
 
     Loop::addReadStream(STDIN, function () use ($client) {
@@ -38,7 +41,7 @@
 
         $promise->then(function ($data) {
             echo '# reply: ' . json_encode($data) . PHP_EOL;
-        }, function ($e) {
+        }, function (Exception $e) {
             echo '# error reply: ' . $e->getMessage() . PHP_EOL;
         });
     });
@@ -48,10 +51,7 @@
 
         Loop::removeReadStream(STDIN);
     });
-}, function (Exception $error) {
-    echo 'CONNECTION ERROR: ' . $error->getMessage() . PHP_EOL;
-    if ($error->getPrevious()) {
-        echo $error->getPrevious()->getMessage() . PHP_EOL;
-    }
+}, function (Exception $e) {
+    echo 'Error: ' . $e->getMessage() . PHP_EOL;
     exit(1);
 });

examples/incr.php

@@ -1,22 +1,22 @@
 <?php
 
+// $ php examples/incr.php
+// $ REDIS_URI=localhost:6379 php examples/incr.php
+
 use Clue\React\Redis\Factory;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $factory = new Factory();
+$client = $factory->createLazyClient(getenv('REDIS_URI') ?: 'localhost:6379');
 
-$client = $factory->createLazyClient('localhost');
 $client->incr('test');
 
 $client->get('test')->then(function ($result) {
     var_dump($result);
 }, function (Exception $e) {
     echo 'Error: ' . $e->getMessage() . PHP_EOL;
-    if ($e->getPrevious()) {
-        echo $e->getPrevious()->getMessage() . PHP_EOL;
-    }
     exit(1);
 });
 
-$client->end();
+//$client->end();

examples/publish.php

@@ -1,22 +1,22 @@
 <?php
 
+// $ php examples/publish.php
+// $ REDIS_URI=localhost:6379 php examples/publish.php channel message
+
 use Clue\React\Redis\Factory;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $factory = new Factory();
+$client = $factory->createLazyClient(getenv('REDIS_URI') ?: 'localhost:6379');
 
 $channel = isset($argv[1]) ? $argv[1] : 'channel';
 $message = isset($argv[2]) ? $argv[2] : 'message';
 
-$client = $factory->createLazyClient('localhost');
 $client->publish($channel, $message)->then(function ($received) {
     echo 'Successfully published. Received by ' . $received . PHP_EOL;
 }, function (Exception $e) {
     echo 'Unable to publish: ' . $e->getMessage() . PHP_EOL;
-    if ($e->getPrevious()) {
-        echo $e->getPrevious()->getMessage() . PHP_EOL;
-    }
     exit(1);
 });
 

examples/subscribe.php

@@ -1,15 +1,18 @@
 <?php
 
+// $ php examples/subscribe.php
+// $ REDIS_URI=localhost:6379 php examples/subscribe.php channel
+
 use Clue\React\Redis\Factory;
 use React\EventLoop\Loop;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 $factory = new Factory();
+$client = $factory->createLazyClient(getenv('REDIS_URI') ?: 'localhost:6379');
 
 $channel = isset($argv[1]) ? $argv[1] : 'channel';
 
-$client = $factory->createLazyClient('localhost');
 $client->subscribe($channel)->then(function () {
     echo 'Now subscribed to channel ' . PHP_EOL;
 }, function (Exception $e) use ($client) {