dev

docker/compose/yl/ylslave-crond/docker-compose.yml

@@ -47,4 +47,20 @@ services:
     deploy:
       resources:
         limits:
+          cpus: '8'
+
+  taskc:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
+      - /nfs/ylupload:/var/www/html/data/upload
+      - /mnt/yllog:/var/www/html/data/log
+    container_name: "yl-taskc"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','task']
+    deploy:
+      resources:
+        limits:
           cpus: '8'

plot/app.py

@@ -28,9 +28,10 @@ logging.basicConfig(filename='/var/www/html/data/log/flask.log',
                     level=logging.DEBUG)
 logger = logging.getLogger('plot')
 
-from refill import ChannelPainter,MerchantPainter
+from refill import ChannelPainter, MerchantPainter
 from refill import filter_chname, filter_cardtype, filter_mchids, get_channels, get_mchids
 
+
 def parse_parmeter():
     end_time = request.args.get('end_time')
     end_time = None if end_time is None else int(end_time.strip())
@@ -49,7 +50,8 @@ def parse_parmeter():
     if filter_wave is not None:
         filter_wave = int(filter_wave.strip())
 
-    return start_time,end_time,card_types,spec,filter_wave
+    return start_time, end_time, card_types, spec, filter_wave
+
 
 def onError(ex):
     logger.error(ex)
@@ -73,6 +75,7 @@ def ch_ratio():
     except Exception as ex:
         return onError(ex)
 
+
 @app.route('/plot/channels')
 def channels():
     try:
@@ -82,6 +85,7 @@ def channels():
         logger.error(ex)
         return jsonify([])
 
+
 @app.route('/plot/mchids')
 def mchids():
     try:
@@ -91,6 +95,7 @@ def mchids():
         logger.error(ex)
         return jsonify([])
 
+
 @app.route('/plot/mch_ratio')
 def mch_ratio():
     try:
@@ -107,6 +112,7 @@ def mch_ratio():
     except Exception as ex:
         return onError(ex)
 
+
 @app.route('/plot/mch_order_send')
 def mch_order_send():
     try:
@@ -123,6 +129,7 @@ def mch_order_send():
     except Exception as ex:
         return onError(ex)
 
+
 @app.route('/plot/index')
 def index():
     app.logger.debug('start')
@@ -146,7 +153,7 @@ def index():
     else:
         interval = int(interval)
 
-    buf = dataCenter.draw_plot(time_stamp, 
+    buf = dataCenter.draw_plot(time_stamp,
                                interval=interval,
                                chname=chname,
                                quality=quality,
@@ -166,6 +173,7 @@ def days():
     dates = dates[0:30]
     return jsonify(dates)
 
+
 @app.route('/plot/paths')
 def paths():
     time_stamp = request.args.get('time_stamp')
@@ -231,4 +239,4 @@ if __name__ == "__main__":
         http_server = WSGIServer(('0.0.0.0', 5000), app)
         geventsig.signal(sig.SIGTERM, lambda: http_server.stop())
         geventsig.signal(sig.SIGINT, lambda: http_server.stop())
-        http_server.serve_forever()
+        http_server.serve_forever()