Commit 5e4c621e authored by Kento HASEGAWA's avatar Kento HASEGAWA
Browse files

Merge branch 'comm-resolver' into 'comm' 

Merge comm-resolver

See merge request adc2018/adc2018-system!8
parents 2cda9dfe a64ea72d

comm/resolver/main.py

+6 −6
Changes for comm/resolver/main.py: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ def resolve(): 
                'resolver': client_baseurl,

                'client': client_baseurl,

                'cputime': data['cputime'],

                'qname': data['qname']

                'qname': data['qname'],

                'req_id': data['req_id']

            }

            # 結果をホストに返す

            r = requests.post("http://{}/post".format(args['host']), data=res)
@@ -90,8 +91,9 @@ def start(): 
    data = {

        'client': request.form['client'],

        'qname': request.form['qname'],

        'answer': request.form['answer'],

        'cputime': request.form['cputime']

        'answer': request.form['solution'],

        'cputime': request.form['cputime'],

        'req_id': request.form['req_id']

    }



    resolve_queue.put(data)
@@ -112,7 +114,7 @@ def stop(): 
        ans = {"status": "Nothing queued"}

    else:

        # pynq_thread.stop()

        while not resolve_queue.emtpy():

        while not resolve_queue.empty():

            resolve_queue.get()

        ans = {"status": "Stopped"}
@@ -121,8 +123,6 @@ def stop(): 
@app.route("/status")

def status():



    # global pynq_thread



    res_mes = ""



    if resolve_queue.empty():