Skip to content
This repository has been archived by the owner on Sep 25, 2023. It is now read-only.

开启SSL时用pomelo stop报错 #662

Merged
merged 3 commits into from Dec 12, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/components/connector.js
Expand Up @@ -78,9 +78,9 @@ pro.stop = function(force, cb) {
this.connector.stop(force, cb);
this.connector = null;
return;
} else {
process.nextTick(cb);
}

process.nextTick(cb);
};

pro.send = function(reqId, route, msg, recvs, opts, cb) {
Expand Down
17 changes: 12 additions & 5 deletions lib/connectors/hybrid/tlssocket.js
Expand Up @@ -15,12 +15,12 @@ var TLS = function(port, opts) {
var ssl = opts.ssl;
switch(ssl.type) {
case 'wss':
var httsServer = https.createServer(ssl).listen(port);
var wss = new WebSocketServer({server: httsServer});
wss.on('connection', this.emit.bind(this, 'connection'));
var httpsServer = https.createServer(ssl).listen(port);
this.server = new WebSocketServer({server: httpsServer});
this.server.on('connection', this.emit.bind(this, 'connection'));
break;
case 'tls':
var tlsServer = tls.createServer(ssl, function(socket) {
this.server = tls.createServer(ssl, function(socket) {
var tcpsocket = new TcpSocket(socket, {headSize: HEAD_SIZE,
headHandler: utils.headHandler,
closeMethod: opts.closeMethod});
Expand All @@ -34,4 +34,11 @@ var TLS = function(port, opts) {
};

util.inherits(TLS, EventEmitter);
module.exports = TLS;

TLS.prototype.close = function() {
if (this.server) {
this.server.close();
}
};

module.exports = TLS;
8 changes: 6 additions & 2 deletions lib/connectors/hybridconnector.js
Expand Up @@ -86,8 +86,12 @@ Connector.prototype.start = function(cb) {
};

Connector.prototype.stop = function(force, cb) {
this.switcher.close();
this.tcpServer.close();
if (!this.ssl) {
this.switcher.close();
this.tcpServer.close();
} else {
this.tlssocket.close();
}

process.nextTick(cb);
};
Expand Down