Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tools/cwrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@
with open(concore.inpath+'1/'+name1, 'rb') as f1:
f = {'file1': f1}
logging.debug(f"CW: before post u={u}")
logging.debug(f'http://www.controlcore.org/pm/{yuyu}{apikey}&fetch={name2}')
r = requests.post('http://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2, files=f,timeout=timeout_max)
logging.debug(f'https://www.controlcore.org/pm/{yuyu}{apikey}&fetch={name2}')
r = requests.post('https://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2, files=f,timeout=timeout_max)
if r.status_code!=200:
logging.error(f"bad POST request {r.status_code}")
quit()
Expand All @@ -117,7 +117,7 @@
with open(concore.inpath+'1/'+name1, 'rb') as f1:
f = {'file1': f1}
try:
r = requests.post('http://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2, files=f,timeout=timeout_max)
r = requests.post('https://www.controlcore.org/pm/'+yuyu+apikey+'&fetch='+name2, files=f,timeout=timeout_max)
except Exception:
logging.error("CW: bad request")
timeout_count += 1
Expand Down
6 changes: 3 additions & 3 deletions tools/pwrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
#initfiles = {'file1': open('./u', 'rb'), 'file2': open(concore.inpath+'1/ym', 'rb')}
initfiles = {'file1': open('./'+name1, 'rb'), 'file2': open(concore.inpath+'1/'+name2, 'rb')}
# POST Request to /init with u as file1 and ym as file2
r = requests.post('http://www.controlcore.org/init/'+yuyu+apikey, files=initfiles)
r = requests.post('https://www.controlcore.org/init/'+yuyu+apikey, files=initfiles)


while(concore.simtime<concore.maxtime):
Expand All @@ -92,7 +92,7 @@
ym = concore.read(1,name2,init_simtime_ym)
f = {'file1': open(concore.inpath+'1/'+name2, 'rb')}
logging.debug(f"PW: before post ym={ym}")
r = requests.post('http://www.controlcore.org/ctl/'+yuyu+apikey+'&fetch='+name1, files=f,timeout=timeout_max)
r = requests.post('https://www.controlcore.org/ctl/'+yuyu+apikey+'&fetch='+name1, files=f,timeout=timeout_max)
if r.status_code!=200:
logging.error(f"bad POST request {r.status_code}")
quit()
Expand All @@ -110,7 +110,7 @@
logging.debug(f"PW waiting status={r.status_code} content={r.content.decode('utf-8')} t={t}")
f = {'file1': open(concore.inpath+'1/'+name2, 'rb')}
try:
r = requests.post('http://www.controlcore.org/ctl/'+yuyu+apikey+'&fetch='+name1, files=f,timeout=timeout_max)
r = requests.post('https://www.controlcore.org/ctl/'+yuyu+apikey+'&fetch='+name1, files=f,timeout=timeout_max)
except:
logging.error("PW: bad requests")
timeout_count += 1
Expand Down