push to remote

fzuslide · Jul 30, 2012 · 034918f · 034918f
1 parent 0a7e587
commit 034918f
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 377 deletions.
diff --git a/config.js b/config.js
diff --git a/controller/index.js b/controller/index.js
diff --git a/controller/publish.js b/controller/publish.js
diff --git a/controller/subscribe.js b/controller/subscribe.js
diff --git a/makefile b/makefile
@@ -9,11 +9,17 @@ package:
 	@echo copy package.json
 	@cp package.json build
 
+
+
 push113: package
+	@echo make config file
+	@mv build/config.113.js build/config.js
 	@echo git push origin master
 	@cd build ; git add ./ ; git commit -a -m 'new changes' ; git push origin master
 
 push61: package
+	@echo make config file
+	@mv build/config.61.js build/config.js
 	@echo git push 61 master
 	@cd build ; git add ./ ; git commit -a -m 'new changes' ; git push 61 master
 

diff --git a/server.js b/server.js
diff --git a/setup.js b/setup.js
diff --git a/socket/index.js b/socket/index.js
diff --git a/src/socket/index.coffee b/src/socket/index.coffee
@@ -21,7 +21,8 @@ module.exports = (io)->
         pushOnlines socket
 
         socket.on 'client-session', (data)->
-            key = "#{ data.project }:#{ data.key }:#{ ip }"
+            #key = "#{ data.project }:#{ data.key }:#{ ip }"
+            key = "#{ data.project }:#{ data.key }"
 
             sessions[socket.id] = key
             user = users[key]

diff --git a/tools/middleware.js b/tools/middleware.js
diff --git a/tools/ping.js b/tools/ping.js
diff --git a/view/index.jade b/view/index.jade
diff --git a/view/index2.jade b/view/index2.jade
diff --git a/view/index3.jade b/view/index3.jade