Commit 1434afab authored by 广宏伟's avatar 广宏伟

Merged in test (pull request #21)

Test
parents e50f93e3 900a61be
...@@ -136,6 +136,7 @@ class Server: ...@@ -136,6 +136,7 @@ class Server:
def close(self): def close(self):
logger.info("Closed server {}".format(self)) logger.info("Closed server {}".format(self))
self.send(b'')
self.chan.close() self.chan.close()
self.stop_evt.set() self.stop_evt.set()
self.chan.close() self.chan.close()
......
...@@ -269,8 +269,9 @@ class S3ReplayRecorder(ServerReplayRecorder): ...@@ -269,8 +269,9 @@ class S3ReplayRecorder(ServerReplayRecorder):
def get_command_recorder_class(config): def get_command_recorder_class(config):
command_storage = config["COMMAND_STORAGE"] command_storage = config["COMMAND_STORAGE"]
storage_type = command_storage.get('TYPE')
if command_storage['TYPE'] == "elasticsearch": if storage_type == "elasticsearch":
return ESCommandRecorder return ESCommandRecorder
else: else:
return ServerCommandRecorder return ServerCommandRecorder
...@@ -278,7 +279,8 @@ def get_command_recorder_class(config): ...@@ -278,7 +279,8 @@ def get_command_recorder_class(config):
def get_replay_recorder_class(config): def get_replay_recorder_class(config):
replay_storage = config["REPLAY_STORAGE"] replay_storage = config["REPLAY_STORAGE"]
if replay_storage['TYPE'] == "s3": storage_type = replay_storage.get('TYPE')
if storage_type == "s3":
return S3ReplayRecorder return S3ReplayRecorder
else: else:
return ServerReplayRecorder return ServerReplayRecorder
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment