Botanical/ext-modular
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade redis client to 4.x

Browse Source
This commit is contained in:
斟酌 鵬兄 2022-04-06 15:47:51 +09:00
parent df548739da
commit c3ccc680d9
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
redisclient.js
View File

@ -10,12 +10,6 @@ var Client = Redis.createClient({
, "url": `redis://${SessConf.config.host}:${SessConf.config.port}/${SessConf.config.database}` , "url": `redis://${SessConf.config.host}:${SessConf.config.port}/${SessConf.config.database}`
}); });
Client.addListener( "error", ( e ) => { throw e; } ); Client.connect();
Client.select( SessConf.config.database, function( err, message )
{
if( err ) throw err;
Dragonfly.Info( "[Session] Database connected. Ready." );
});
module.exports = Client; module.exports = Client;

26
session.js
View File

@ -44,9 +44,13 @@ class Session extends EventEmitter
{ {
if( err ) throw err; if( err ) throw err;
if( _self.exists = !!obj ) if( _self.exists = !!obj.length )
{ {
_self.__sess = obj; _self.__sess = {};
for( var i = 0, l = obj.length; i < l; i += 2 )
{
_self.__sess[obj[i]] = obj[ i + 1 ];
}
} }
// Auto reset the session id if no match // Auto reset the session id if no match
else if( !noIdReset ) else if( !noIdReset )
@ -91,10 +95,17 @@ class Session extends EventEmitter
Client.DEL( this.id, handler || this.__emitOk ); Client.DEL( this.id, handler || this.__emitOk );
} }
set( name, val ) set( dict, handler )
{ {
this.__sess[ name ] = val; var chain = Client.multi();
Client.HSET( this.id, name, val, this.__emitOk ); for( let k in dict )
{
var v = dict[k];
this.__sess[ k ] = v;
chain = chain.HSET( this.id, k, v );
}
chain.exec( handler || this.__emitOk );
} }
get( name ) get( name )
@ -140,11 +151,6 @@ class Session extends EventEmitter
.EXPIRE( this.id, ttl, this.__emitOk ) .EXPIRE( this.id, ttl, this.__emitOk )
.exec( this.__emitOk ); .exec( this.__emitOk );
} }
get busy()
{
return 0 < ( Client.command_queue.length + Client.offline_queue.length );
}
} }
Session.SessionEventArgs = SessionEventArgs; Session.SessionEventArgs = SessionEventArgs;