Compare commits
3 Commits
14f55ef017
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
622e7284db
|
|||
|
8d6e6a9c26
|
|||
|
08ef024bf1
|
4
git-after.sh
Normal file
4
git-after.sh
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
cd output
|
||||||
|
sudo git add .
|
||||||
|
sudo git commit -m "$(date +'%Y-%m-%d %H:%M:%S')"
|
||||||
|
sudo git push origin main
|
||||||
@@ -8,8 +8,4 @@ cd config
|
|||||||
sudo git fetch origin
|
sudo git fetch origin
|
||||||
sudo git reset --hard origin/main
|
sudo git reset --hard origin/main
|
||||||
cd ..
|
cd ..
|
||||||
sleep 120
|
sudo python3 -m pip install -r requirements.txt
|
||||||
cd output
|
|
||||||
sudo git add .
|
|
||||||
sudo git commit -m "$(date +'%Y-%m-%d %H:%M:%S')"
|
|
||||||
sudo git push origin main
|
|
||||||
13
main.py
13
main.py
@@ -88,10 +88,8 @@ def main():
|
|||||||
logger = logging.getLogger("main")
|
logger = logging.getLogger("main")
|
||||||
|
|
||||||
db = Database(config_file_name)
|
db = Database(config_file_name)
|
||||||
next_exec_time = time.time()
|
|
||||||
config = config_load(config_file_path)
|
config = config_load(config_file_path)
|
||||||
|
|
||||||
while True:
|
|
||||||
logger.info("开始检查")
|
logger.info("开始检查")
|
||||||
try:
|
try:
|
||||||
old_config = config
|
old_config = config
|
||||||
@@ -176,22 +174,19 @@ def main():
|
|||||||
trade_data["order"]["type"],
|
trade_data["order"]["type"],
|
||||||
trade_data["order"]["side"],
|
trade_data["order"]["side"],
|
||||||
trade_data["order"]["amount"],
|
trade_data["order"]["amount"],
|
||||||
trade_data["order"].get("price", None),
|
trade_data["order"]["price"],
|
||||||
)
|
)
|
||||||
if order_detail["status"] == "open":
|
if order_detail["status"] == "closed":
|
||||||
db.data[trade_id]["order_id"]["open"].append(order_detail["id"])
|
|
||||||
db.data[trade_id]["counter"]["open"] += 1
|
|
||||||
elif order_detail["status"] == "closed":
|
|
||||||
logger.info("%s: 订单成交", order_detail["id"])
|
logger.info("%s: 订单成交", order_detail["id"])
|
||||||
csv_record(config_file_name, order_detail, accounts[trade_data["account"]].id, trade_data.get("csv_symbol", None))
|
csv_record(config_file_name, order_detail, accounts[trade_data["account"]].id, trade_data.get("csv_symbol", None))
|
||||||
db.data[trade_id]["order_id"]["filled"].append(order_detail["id"])
|
db.data[trade_id]["order_id"]["filled"].append(order_detail["id"])
|
||||||
db.data[trade_id]["counter"]["filled"] += 1
|
db.data[trade_id]["counter"]["filled"] += 1
|
||||||
else:
|
else:
|
||||||
|
db.data[trade_id]["order_id"]["open"].append(order_detail["id"])
|
||||||
|
db.data[trade_id]["counter"]["open"] += 1
|
||||||
logger.warning("%s: 订单状态为 %s,未加入追踪", order_detail["id"], order_detail["status"])
|
logger.warning("%s: 订单状态为 %s,未加入追踪", order_detail["id"], order_detail["status"])
|
||||||
|
|
||||||
db.save()
|
db.save()
|
||||||
next_exec_time += config["interval"]
|
|
||||||
time.sleep(max(0, next_exec_time - time.time()))
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
Reference in New Issue
Block a user