mise a jour
This commit is contained in:
parent
6c6b1536a7
commit
81cad4643c
4 changed files with 54 additions and 25 deletions
|
@ -1,4 +1,5 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
|
#coding: utf-8
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import requests
|
import requests
|
||||||
|
@ -7,12 +8,43 @@ import requests
|
||||||
BOOTSTRAP_SERVER_ADDRESS = '10.10.10.10:5555'
|
BOOTSTRAP_SERVER_ADDRESS = '10.10.10.10:5555'
|
||||||
|
|
||||||
def retrieve_config():
|
def retrieve_config():
|
||||||
my_config = "None"
|
my_json_config = {"verdict":"oops"}
|
||||||
my_ip = subprocess.check_output("sleep 5 && echo $MY_IP", shell=True).rstrip()
|
my_ip = str(subprocess.check_output("echo $MY_IP", shell=True)).rstrip()
|
||||||
resp = requests.get("http://%s/getmyconfig/%s"%(BOOTSTRAP_SERVER_ADDRESS, my_ip))
|
print("MY_IP : %s"%(my_ip))
|
||||||
my_config = resp.text
|
while my_json_config["verdict"] != "yes":
|
||||||
if my_config != "None":
|
try:
|
||||||
|
resp = requests.get("http://%s/getmyconfig/%s"%(BOOTSTRAP_SERVER_ADDRESS, my_ip), timeout=2)
|
||||||
|
except:
|
||||||
|
print("Unable to join the bootstrap server")
|
||||||
|
try:
|
||||||
|
my_json_config = resp.json()
|
||||||
|
print("Extracted configs [succ] : %s"%(my_json_config))
|
||||||
|
except:
|
||||||
|
print("Unable to extract configs from bootstrap server's answer")
|
||||||
|
print("Extracted configs [fail] : %s"%(my_json_config))
|
||||||
|
print("request url : ==>%s<=="%("http://%s/getmyconfig/%s"%(BOOTSTRAP_SERVER_ADDRESS, my_ip)))
|
||||||
|
if "verdict" in my_json_config and my_json_config["verdict"] == "yes":
|
||||||
|
my_config = config_json_to_string(my_json_config)
|
||||||
subprocess.check_output("node /mydir/*.js %s"%(my_config), shell=True)
|
subprocess.check_output("node /mydir/*.js %s"%(my_config), shell=True)
|
||||||
#print("my_ip=%s and of type %s"%(my_ip,type(my_ip)))
|
else:
|
||||||
|
my_json_config = {"verdict":"oops"}
|
||||||
|
|
||||||
|
def config_json_to_string(json_config):
|
||||||
|
config = ""
|
||||||
|
if "local_ip" in json_config:
|
||||||
|
config += "--local_ip "+json_config["local_ip"]
|
||||||
|
if "local_port" in json_config:
|
||||||
|
config += "--local_port "+str(json_config["local_port"])
|
||||||
|
if "local_name" in json_config:
|
||||||
|
config += "--local_name "+json_config["local_name"]
|
||||||
|
if "remote_ip" in json_config:
|
||||||
|
config += "--remote_ip "+json_config["remote_ip"]
|
||||||
|
if "remote_port" in json_config:
|
||||||
|
config += "--remote_port "+str(json_config["remote_port"])
|
||||||
|
if "remote_name" in json_config:
|
||||||
|
config += "--remote_name "+json_config["remote_name"]
|
||||||
|
if "send_period" in json_config:
|
||||||
|
config += "--send_period "+str(json_config["send_period"])
|
||||||
|
return config
|
||||||
|
|
||||||
retrieve_config()
|
retrieve_config()
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python3
|
#!/usr/bin/python
|
||||||
#coding: utf-8
|
#coding: utf-8
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
|
@ -9,8 +9,7 @@ BOOTSTRAP_SERVER_ADDRESS = '10.10.10.10:5555'
|
||||||
|
|
||||||
def retrieve_config():
|
def retrieve_config():
|
||||||
my_json_config = {"verdict":"oops"}
|
my_json_config = {"verdict":"oops"}
|
||||||
my_ip_ = str(subprocess.check_output("echo $MY_IP", shell=True)) #subprocess returning format: b'X.X.X.X\n'
|
my_ip = str(subprocess.check_output("echo $MY_IP", shell=True)).rstrip()
|
||||||
my_ip = my_ip_.replace("b'",'').replace("'",'').replace("\\n",'')
|
|
||||||
print("MY_IP : %s"%(my_ip))
|
print("MY_IP : %s"%(my_ip))
|
||||||
while my_json_config["verdict"] != "yes":
|
while my_json_config["verdict"] != "yes":
|
||||||
try:
|
try:
|
||||||
|
@ -35,17 +34,17 @@ def config_json_to_string(json_config):
|
||||||
if "local_ip" in json_config:
|
if "local_ip" in json_config:
|
||||||
config += "--local_ip "+json_config["local_ip"]
|
config += "--local_ip "+json_config["local_ip"]
|
||||||
if "local_port" in json_config:
|
if "local_port" in json_config:
|
||||||
config += "--local_port "+json_config["local_port"]
|
config += "--local_port "+str(json_config["local_port"])
|
||||||
if "local_name" in json_config:
|
if "local_name" in json_config:
|
||||||
config += "--local_name "+json_config["local_name"]
|
config += "--local_name "+json_config["local_name"]
|
||||||
if "remote_ip" in json_config:
|
if "remote_ip" in json_config:
|
||||||
config += "--remote_ip "+json_config["remote_ip"]
|
config += "--remote_ip "+json_config["remote_ip"]
|
||||||
if "remote_port" in json_config:
|
if "remote_port" in json_config:
|
||||||
config += "--remote_port "+json_config["remote_port"]
|
config += "--remote_port "+str(json_config["remote_port"])
|
||||||
if "remote_name" in json_config:
|
if "remote_name" in json_config:
|
||||||
config += "--remote_name "+json_config["remote_name"]
|
config += "--remote_name "+json_config["remote_name"]
|
||||||
if "send_period" in json_config:
|
if "send_period" in json_config:
|
||||||
config += "--send_period "+json_config["send_period"]
|
config += "--send_period "+str(json_config["send_period"])
|
||||||
return config
|
return config
|
||||||
|
|
||||||
retrieve_config()
|
retrieve_config()
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python3
|
#!/usr/bin/python
|
||||||
#coding: utf-8
|
#coding: utf-8
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
|
@ -9,8 +9,7 @@ BOOTSTRAP_SERVER_ADDRESS = '10.10.10.10:5555'
|
||||||
|
|
||||||
def retrieve_config():
|
def retrieve_config():
|
||||||
my_json_config = {"verdict":"oops"}
|
my_json_config = {"verdict":"oops"}
|
||||||
my_ip_ = str(subprocess.check_output("echo $MY_IP", shell=True)) #subprocess returning format: b'X.X.X.X\n'
|
my_ip = str(subprocess.check_output("echo $MY_IP", shell=True)).rstrip()
|
||||||
my_ip = my_ip_.replace("b'",'').replace("'",'').replace("\\n",'')
|
|
||||||
print("MY_IP : %s"%(my_ip))
|
print("MY_IP : %s"%(my_ip))
|
||||||
while my_json_config["verdict"] != "yes":
|
while my_json_config["verdict"] != "yes":
|
||||||
try:
|
try:
|
||||||
|
@ -35,17 +34,17 @@ def config_json_to_string(json_config):
|
||||||
if "local_ip" in json_config:
|
if "local_ip" in json_config:
|
||||||
config += "--local_ip "+json_config["local_ip"]
|
config += "--local_ip "+json_config["local_ip"]
|
||||||
if "local_port" in json_config:
|
if "local_port" in json_config:
|
||||||
config += "--local_port "+json_config["local_port"]
|
config += "--local_port "+str(json_config["local_port"])
|
||||||
if "local_name" in json_config:
|
if "local_name" in json_config:
|
||||||
config += "--local_name "+json_config["local_name"]
|
config += "--local_name "+json_config["local_name"]
|
||||||
if "remote_ip" in json_config:
|
if "remote_ip" in json_config:
|
||||||
config += "--remote_ip "+json_config["remote_ip"]
|
config += "--remote_ip "+json_config["remote_ip"]
|
||||||
if "remote_port" in json_config:
|
if "remote_port" in json_config:
|
||||||
config += "--remote_port "+json_config["remote_port"]
|
config += "--remote_port "+str(json_config["remote_port"])
|
||||||
if "remote_name" in json_config:
|
if "remote_name" in json_config:
|
||||||
config += "--remote_name "+json_config["remote_name"]
|
config += "--remote_name "+json_config["remote_name"]
|
||||||
if "send_period" in json_config:
|
if "send_period" in json_config:
|
||||||
config += "--send_period "+json_config["send_period"]
|
config += "--send_period "+str(json_config["send_period"])
|
||||||
return config
|
return config
|
||||||
|
|
||||||
retrieve_config()
|
retrieve_config()
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python3
|
#!/usr/bin/python
|
||||||
#coding: utf-8
|
#coding: utf-8
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
|
@ -9,8 +9,7 @@ BOOTSTRAP_SERVER_ADDRESS = '10.10.10.10:5555'
|
||||||
|
|
||||||
def retrieve_config():
|
def retrieve_config():
|
||||||
my_json_config = {"verdict":"oops"}
|
my_json_config = {"verdict":"oops"}
|
||||||
my_ip_ = str(subprocess.check_output("echo $MY_IP", shell=True)) #subprocess returning format: b'X.X.X.X\n'
|
my_ip = str(subprocess.check_output("echo $MY_IP", shell=True)).rstrip()
|
||||||
my_ip = my_ip_.replace("b'",'').replace("'",'').replace("\\n",'')
|
|
||||||
print("MY_IP : %s"%(my_ip))
|
print("MY_IP : %s"%(my_ip))
|
||||||
while my_json_config["verdict"] != "yes":
|
while my_json_config["verdict"] != "yes":
|
||||||
try:
|
try:
|
||||||
|
@ -35,17 +34,17 @@ def config_json_to_string(json_config):
|
||||||
if "local_ip" in json_config:
|
if "local_ip" in json_config:
|
||||||
config += "--local_ip "+json_config["local_ip"]
|
config += "--local_ip "+json_config["local_ip"]
|
||||||
if "local_port" in json_config:
|
if "local_port" in json_config:
|
||||||
config += "--local_port "+json_config["local_port"]
|
config += "--local_port "+str(json_config["local_port"])
|
||||||
if "local_name" in json_config:
|
if "local_name" in json_config:
|
||||||
config += "--local_name "+json_config["local_name"]
|
config += "--local_name "+json_config["local_name"]
|
||||||
if "remote_ip" in json_config:
|
if "remote_ip" in json_config:
|
||||||
config += "--remote_ip "+json_config["remote_ip"]
|
config += "--remote_ip "+json_config["remote_ip"]
|
||||||
if "remote_port" in json_config:
|
if "remote_port" in json_config:
|
||||||
config += "--remote_port "+json_config["remote_port"]
|
config += "--remote_port "+str(json_config["remote_port"])
|
||||||
if "remote_name" in json_config:
|
if "remote_name" in json_config:
|
||||||
config += "--remote_name "+json_config["remote_name"]
|
config += "--remote_name "+json_config["remote_name"]
|
||||||
if "send_period" in json_config:
|
if "send_period" in json_config:
|
||||||
config += "--send_period "+json_config["send_period"]
|
config += "--send_period "+str(json_config["send_period"])
|
||||||
return config
|
return config
|
||||||
|
|
||||||
retrieve_config()
|
retrieve_config()
|
||||||
|
|
Loading…
Reference in a new issue