[Groonga-commit] groonga/express-kotoumi [master] Set session id directly

Back to archive index

YUKI Hiroshi null+****@clear*****
Wed Feb 6 19:18:31 JST 2013


YUKI Hiroshi	2013-02-06 19:18:31 +0900 (Wed, 06 Feb 2013)

  New Revision: bded883c9f6a37a9e6bec2f484ac20cdb9260576
  https://github.com/groonga/express-kotoumi/commit/bded883c9f6a37a9e6bec2f484ac20cdb9260576

  Log:
    Set session id directly

  Modified files:
    lib/backend/connection.js
    lib/frontend/socket.io-adaptor.js
    test/frontend-socket.io-adaptor.test.js

  Modified: lib/backend/connection.js (+2 -2)
===================================================================
--- lib/backend/connection.js    2013-02-06 19:13:09 +0900 (88b9d79)
+++ lib/backend/connection.js    2013-02-06 19:18:31 +0900 (d0521d0)
@@ -119,8 +119,8 @@ Connection.prototype.emitMessage = function(type, body, callback, options) {
     type:       type,
     body:       body
   };
-  if (options.socket) {
-    envelope.sessionId = options.socket.id;
+  if (options.sessionId) {
+    envelope.sessionId = options.sessionId;
   }
   if (callback) {
     var event = 'inReplyTo:' + id;

  Modified: lib/frontend/socket.io-adaptor.js (+1 -1)
===================================================================
--- lib/frontend/socket.io-adaptor.js    2013-02-06 19:13:09 +0900 (b07b7d1)
+++ lib/frontend/socket.io-adaptor.js    2013-02-06 19:18:31 +0900 (fd6f0de)
@@ -33,7 +33,7 @@ exports.register = function(application, server, params) {
     return (function(data) {
       if (requestBuilder)
         data = requestBuilder(data);
-      connection.emitMessage(command, data, null, { socket: socket });
+      connection.emitMessage(command, data, null, { sessionId: socket.id });
     });
   }
 

  Modified: test/frontend-socket.io-adaptor.test.js (+1 -1)
===================================================================
--- test/frontend-socket.io-adaptor.test.js    2013-02-06 19:13:09 +0900 (8d47618)
+++ test/frontend-socket.io-adaptor.test.js    2013-02-06 19:18:31 +0900 (54541fb)
@@ -124,7 +124,7 @@ suite('Socket.IO API', function() {
   test('front to back', function(done) {
     connection = utils.createMockedBackendConnection()
       .mock('emitMessage')
-        .takes('search', { requestMessage: true });
+        .takes('search', { requestMessage: true }, null, { sessionId: '' });
 
     var application = express();
     utils.setupServer(application)
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index