Merge pull request #18 from rolies106/master

Some enhancement
wa0x6e · Sep 18, 2013 · 5ba56c9 · 5ba56c9
2 parents a376581 + 8d369ac
commit 5ba56c9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,8 @@ node_modules/
 composer.lock
 composer.phar
 vendor/
-src/ResqueBoard/cache/*
+src/ResqueBoard/cache/*
+
+*.DS_Store
+*Thumbs.db
+*~
diff --git a/src/ResqueBoard/Config/Core.php b/src/ResqueBoard/Config/Core.php
@@ -31,7 +31,7 @@
  */
 $settings = array(
     'cubePublic' => array(
-        'host' => $_SERVER['SERVER_NAME'],
+        'host' => (isset($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : 'http://localhost:1081/',
         'port' => 1081
     ),
     'readOnly' => true,
@@ -50,6 +50,7 @@
         'host' => '127.0.0.1',
         'port' => 6379,
         'database' => 0,
+        'password' => '',
         'prefix' => 'resque'
     ),
     'Mongo' => array(

diff --git a/src/ResqueBoard/Lib/Service/Redis.php b/src/ResqueBoard/Lib/Service/Redis.php
@@ -38,6 +38,12 @@ public function __construct($settings)
 
         try {
             $redis->connect($settings['host'], $settings['port']);
+
+            if (isset($settings['password']) && !empty($settings['password'])) {
+                if ($redis->auth($settings['password']) === false) {
+                    throw new \Exception('Unable to authenticate with redis!');
+                }
+            }
         } catch (\Exception $e) {
             throw new \Exception('Unable to connect to Redis server');
         }

diff --git a/tests/ResqueBoard/Lib/Resque/ApiTest.php b/tests/ResqueBoard/Lib/Resque/ApiTest.php
@@ -20,6 +20,10 @@
 
 namespace ResqueBoard\Test\Lib\Resque;
 
+# Include configuration files
+require_once(dirname(__FILE__) . '/../../../../src/ResqueBoard/Config/Bootstrap.php');
+require_once(dirname(__FILE__) . '/../../../../src/ResqueBoard/Config/Core.php');
+
 /**
  * ApiTest Class
  *