undersys/frankenrouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add log prefix

Browse source
This commit is contained in:
deflax 2018-04-12 16:43:57 -04:00
parent 6f5552fcc1
commit c6f6a70261
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
updateipcache.py
View file

@ -5,6 +5,9 @@ import json
import sys import sys
import re import re
import subprocess import subprocess
from datetime import datetime
logp = datetime.now().strftime('[%Y-%m-%d-%H:%M] ')
class DictDiffer(object): class DictDiffer(object):
""" """
@ -48,7 +51,7 @@ try:
apireq = requests.post(api_url, headers={'Content-Type': 'application/json'}, data=json.dumps(data), timeout=30) apireq = requests.post(api_url, headers={'Content-Type': 'application/json'}, data=json.dumps(data), timeout=30)
result = apireq.json() result = apireq.json()
except: except:
print('can not connect') print(logp + 'can not connect')
sys.exit() sys.exit()
if result['status'] == 'ok': if result['status'] == 'ok':
@ -67,14 +70,14 @@ if result['status'] == 'ok':
for ipkey in difference.removed(): for ipkey in difference.removed():
ip = ipkey ip = ipkey
vlan = current_list[ipkey] vlan = current_list[ipkey]
print('removed {} from {}'.format(ip, vlan)) print(logp + 'removed {} from {}'.format(ip, vlan))
newdataflag = True newdataflag = True
subprocess.call('python3 /root/frankenrouter/frankenrouter.py ipdel {} {}'.format(ip, vlan), shell=True) subprocess.call('python3 /root/frankenrouter/frankenrouter.py ipdel {} {}'.format(ip, vlan), shell=True)
if len(difference.added()) is not 0: if len(difference.added()) is not 0:
for ipkey in difference.added(): for ipkey in difference.added():
ip = ipkey ip = ipkey
vlan = new_list[ipkey] vlan = new_list[ipkey]
print('added {} to {}'.format(ip, vlan)) print(logp + 'added {} to {}'.format(ip, vlan))
newdataflag = True newdataflag = True
subprocess.call('python3 /root/frankenrouter/frankenrouter.py ipadd {} {}'.format(ip, vlan), shell=True) subprocess.call('python3 /root/frankenrouter/frankenrouter.py ipadd {} {}'.format(ip, vlan), shell=True)
@ -85,11 +88,11 @@ if result['status'] == 'ok':
w_ca = open('/root/pubip.cache', 'w') w_ca = open('/root/pubip.cache', 'w')
w_ca.write(json.dumps(new_list)) w_ca.write(json.dumps(new_list))
w_ca.close() w_ca.close()
print('public ip cache updated with the new data') print(logp + 'public ip cache updated with the new data')
else: else:
pass pass
else: else:
print('no data error') print(logp + 'no data error')