move faye-redis config out for config.js

actionhero · Mar 11, 2013 · 6d39993 · 6d39993
1 parent 1401b17
commit 6d39993
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/config.js b/config.js
@@ -93,14 +93,6 @@ configData.faye = {
   mount: "/faye",
   timeout: 45,
   ping: null,
-  engine: {
-    type: require('faye-redis'),
-    host: configData.redis.host,
-    port: configData.redis.port,
-    password: configData.redis.password,
-    database: configData.redis.DB,
-    namespace: "faye:",
-  }
 };
 
 ///////////////////////////////////////
@@ -175,7 +167,7 @@ configData.tcpServer = {
 
 configData.webSockets = {
   // You must have the web server enabled as well
-  enable: false,
+  enable: true,
 };
 
 //////////////////////////////////

diff --git a/examples/clients/web/webSockets.html b/examples/clients/web/webSockets.html
@@ -1,6 +1,9 @@
 <script src="/faye/client.js"></script>
 <script src="/public/javascript/actionHeroWebSocket.js"></script>
 
+<h1>Websocket Example</h1>
+Open the Console.
+
 <script>
 
   var A = new actionHeroWebSocket;

diff --git a/initializers/faye.js b/initializers/faye.js
@@ -9,7 +9,20 @@ var faye = function(api, next){
   // api.faye.subscribeHandlers = [];
 
   api.faye._start = function(api, next){
-    api.faye.server = new fayePackage.NodeAdapter(api.configData.faye);
+
+    var options = api.configData.faye;
+    if(api.redis.fake != true){
+      options.engine = {
+        type: require('faye-redis'),
+        host: api.configData.redis.host,
+        port: api.configData.redis.port,
+        password: api.configData.redis.password,
+        database: api.configData.redis.DB,
+        namespace: "faye:",
+      }
+    }
+
+    api.faye.server = new fayePackage.NodeAdapter(options);
 
     api.faye.server.bind('handshake', function(clientId){
       for(var i in api.faye.connectHandlers){