senset/vnpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Mod] use write_log function of main_engine

Browse Source
This commit is contained in:
vn.py 2019-06-14 09:04:50 +08:00
parent e71f84bf9c
commit 1214b636b4
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
examples/no_ui/run.py
View File

@ -35,34 +35,30 @@ def run_child():
""" """
SETTINGS["log.file"] = True SETTINGS["log.file"] = True
print("-" * 20)
event_engine = EventEngine() event_engine = EventEngine()
main_engine = MainEngine(event_engine) main_engine = MainEngine(event_engine)
log_engine = main_engine.get_engine("log")
log_engine.log("主引擎创建成功")
main_engine.add_gateway(CtpGateway) main_engine.add_gateway(CtpGateway)
cta_engine = main_engine.add_app(CtaStrategyApp) cta_engine = main_engine.add_app(CtaStrategyApp)
main_engine.write_log("主引擎创建成功")
log_engine = main_engine.get_engine("log")
event_engine.register(EVENT_CTA_LOG, log_engine.process_log_event) event_engine.register(EVENT_CTA_LOG, log_engine.process_log_event)
log_engine.log("注册日志事件监听") main_engine.write_log("注册日志事件监听")
main_engine.connect(ctp_setting, "CTP") main_engine.connect(ctp_setting, "CTP")
log_engine.log("连接CTP接口") main_engine.write_log("连接CTP接口")
sleep(10) sleep(10)
cta_engine.init_engine() cta_engine.init_engine()
log_engine.log("CTA策略初始化完成") main_engine.write_log("CTA策略初始化完成")
cta_engine.init_all_strategies() cta_engine.init_all_strategies()
sleep(10) sleep(60) # Leave enough time to complete strategy initialization
log_engine.log("CTA策略全部初始化") main_engine.write_log("CTA策略全部初始化")
cta_engine.start_all_strategies() cta_engine.start_all_strategies()
log_engine.log("CTA策略全部启动") main_engine.write_log("CTA策略全部启动")
while True: while True:
sleep(1) sleep(1)
@ -89,9 +85,9 @@ def run_parent():
# Check whether in trading period # Check whether in trading period
if ( if (
(current_time >= DAY_START and current_time <= DAY_END) (current_time >= DAY_START and current_time <= DAY_END) or
or (current_time >= NIGHT_START) (current_time >= NIGHT_START) or
or (current_time <= NIGHT_END) (current_time <= NIGHT_END)
): ):
trading = True trading = True

9
vnpy/trader/engine.py
View File

@ -9,7 +9,6 @@ from email.message import EmailMessage
from queue import Empty, Queue from queue import Empty, Queue
from threading import Thread from threading import Thread
from typing import Any, Sequence from typing import Any, Sequence
from logging import INFO
from vnpy.event import Event, EventEngine from vnpy.event import Event, EventEngine
from .app import BaseApp from .app import BaseApp
@ -315,13 +314,7 @@ class LogEngine(BaseEngine):
Process log event. Process log event.
""" """
log = event.data log = event.data
self.log(log.msg, log.level) self.logger.log(log.level, log.msg)
def log(self, msg: str, level: int = INFO):
"""
Output log event data with logging function.
"""
self.logger.log(level, msg)
class OmsEngine(BaseEngine): class OmsEngine(BaseEngine):