From 601db4cf4a344dcaa3a06e61f09eb13638753b69 Mon Sep 17 00:00:00 2001
From: "vn.py" <vn.py@foxmail.com>
Date: Fri, 15 Dec 2017 20:56:42 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]=E7=A7=BB=E9=99=A4Singleton=E7=9A=84?=
 =?UTF-8?q?=E5=8D=95=E4=BE=8B=E6=A8=A1=E5=BC=8F=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vnpy/trader/vtEngine.py | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/vnpy/trader/vtEngine.py b/vnpy/trader/vtEngine.py
index 94492c8d..1d717795 100644
--- a/vnpy/trader/vtEngine.py
+++ b/vnpy/trader/vtEngine.py
@@ -352,7 +352,7 @@ class MainEngine(object):
     def convertOrderReq(self, req):
         """转换委托请求"""
         return self.dataEngine.convertOrderReq(req)
-        
+
 
 ########################################################################
 class DataEngine(object):
@@ -532,34 +532,28 @@ class DataEngine(object):
             return [req]
         else:
             return detail.convertOrderReq(req)
-        
-        
-########################################################################
-class Singleton(type):
-    """
-    单例，应用方式:静态变量 __metaclass__ = Singleton
-    """
-    def __init__(cls, name, bases, dict):
-        super(Singleton, cls).__init__(name, bases, dict)
-        cls._instance = None
 
-    def __call__(cls, *args, **kw):
-        if cls._instance is None:
-            cls._instance = super(Singleton, cls).__call__(*args, **kw)
-        return cls._instance
-    
+
+########################################################################    
 class LogEngine(object):
     """日志引擎"""
     
-    # 单例模式
-    __metaclass__ = Singleton
-    
     # 日志级别
     LEVEL_DEBUG = logging.DEBUG
     LEVEL_INFO = logging.INFO
     LEVEL_WARN = logging.WARN
     LEVEL_ERROR = logging.ERROR
     LEVEL_CRITICAL = logging.CRITICAL
+    
+    # 单例对象
+    instance = None
+    
+    #----------------------------------------------------------------------
+    def __new__(cls, *args, **kwargs):
+        """创建对象，保证单例"""
+        if not cls.instance:
+            cls.instance = super(LogEngine, cls).__new__(cls, *args, **kwargs)
+        return cls.instance
 
     #----------------------------------------------------------------------
     def __init__(self):
@@ -792,8 +786,6 @@ class PositionDetail(object):
         self.longPos = self.longTd + self.longYd
         self.shortPos = self.shortTd + self.shortYd      
         
-        #self.output()
-        
     #----------------------------------------------------------------------
     def calculateFrozen(self):
         """计算冻结情况"""
@@ -844,8 +836,6 @@ class PositionDetail(object):
             # 汇总今昨冻结
             self.longPosFrozen = self.longYdFrozen + self.longTdFrozen
             self.shortPosFrozen = self.shortYdFrozen + self.shortTdFrozen
-        
-        #self.output()
             
     #----------------------------------------------------------------------
     def output(self):