Merge branch 'dev' of github.com:DemoHn/obsidian-panel into dev

DemoHn · Jan 30, 2017 · 2120e9d · 2120e9d
2 parents 0524a22 + 3dd306a
commit 2120e9d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/task_scheduler/tasks/download.py b/task_scheduler/tasks/download.py
@@ -141,14 +141,13 @@ def _extract_file(download_result, filename):
             _send_dw_signal("_extract_start", hash, True)
 
             # run tar command
-            cmd = "tar -xzf --overwrite %s -C %s" % (filename, root_dir)
+            cmd = "tar -xzf %s -C %s" % (filename, root_dir)
             # open archive
             #archive = tarfile.open(filename)
             p = subprocess.Popen(cmd, shell=True)
             rc = p.wait()
             # If untar file error
             if rc != 0:
-                logger.error(traceback.format_exc())
                 self.tasks_pool.update(hash, status=_utils.EXTRACT_FAIL)
                 # send extract_finish event (when extract failed)
                 _send_dw_signal("_extract_finish", hash, False)

diff --git a/websocket_server/ws_conn.py b/websocket_server/ws_conn.py
@@ -100,10 +100,6 @@ def on_disconnect(sid):
     def _init_message_event(self):
         @self.sio.on('message', namespace="/")
         def emit_message(sid, data):
-            from . import logger
-            #proxy = MessageQueueProxy(WS_TAG.CONTROL)
-
-            _flag  = data.get("flag")
             _event = data.get("event")
             _props = data.get("props")
 
@@ -112,13 +108,7 @@ def emit_message(sid, data):
             avail = self.sid_available(sid, permission=PRIVILEGES.ROOT_USER)
 
             if avail == True:
-                # from CLIENT -> CONTROL
-                #
                 logger.debug("send <-- event = %s, props = %s" % (_event, _props))
-                #proxy.send(_flag, _event, _props, WS_TAG.CONTROL,
-                #           uid = ws.find_uid(sid),
-                #           sid = sid,
-                #           _src= WS_TAG.CLIENT)
             else:
                 logger.debug("reject <-- event = %s, props = %s" % (_event, _props))