Fix in send_info_daemon
This commit is contained in:
parent
873e34a3cf
commit
d9cb621811
2 changed files with 30 additions and 1 deletions
|
|
@ -17,6 +17,7 @@ import argparse
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import sched, time
|
import sched, time
|
||||||
|
from importlib import import_module
|
||||||
|
|
||||||
|
|
||||||
#url="http://url/to/info"
|
#url="http://url/to/info"
|
||||||
|
|
@ -25,6 +26,8 @@ user_home=str(Path.home())
|
||||||
|
|
||||||
hostname=getfqdn()
|
hostname=getfqdn()
|
||||||
|
|
||||||
|
modules_imported={}
|
||||||
|
|
||||||
def load_config():
|
def load_config():
|
||||||
|
|
||||||
yes_config=False
|
yes_config=False
|
||||||
|
|
@ -74,6 +77,21 @@ def load_config():
|
||||||
if 'group' in config['DEFAULT']:
|
if 'group' in config['DEFAULT']:
|
||||||
group=config['DEFAULT']['group']
|
group=config['DEFAULT']['group']
|
||||||
|
|
||||||
|
|
||||||
|
modules={}
|
||||||
|
|
||||||
|
if 'modules' in config['DEFAULT']:
|
||||||
|
arr_modules=config['DEFAULT']['modules'].split(',')
|
||||||
|
|
||||||
|
#load modules
|
||||||
|
|
||||||
|
for module in arr_modules:
|
||||||
|
|
||||||
|
if not module in modules_imported:
|
||||||
|
|
||||||
|
modules_imported[module]=import_module(module)
|
||||||
|
|
||||||
|
|
||||||
return url, group
|
return url, group
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -103,7 +121,12 @@ def run(url, group=''):
|
||||||
|
|
||||||
mem_info=psutil.virtual_memory()
|
mem_info=psutil.virtual_memory()
|
||||||
|
|
||||||
json_info=json.dumps({'net_info': network_info, 'cpu_idle': cpu_idle, 'cpus_idle': cpus_idle, 'cpu_number': cpu_number, 'disks_info': partitions, 'mem_info': mem_info, 'hostname': hostname, 'group': group})
|
obj_stats={'net_info': network_info, 'cpu_idle': cpu_idle, 'cpus_idle': cpus_idle, 'cpu_number': cpu_number, 'disks_info': partitions, 'mem_info': mem_info, 'hostname': hostname, 'group': group}
|
||||||
|
|
||||||
|
for module in modules_imported.values():
|
||||||
|
obj_stats=module.stat(obj_stats)
|
||||||
|
|
||||||
|
json_info=json.dumps(obj_stats)
|
||||||
|
|
||||||
data = urllib.parse.urlencode({'data_json': json_info})
|
data = urllib.parse.urlencode({'data_json': json_info})
|
||||||
|
|
||||||
|
|
|
||||||
6
pastafaristats/utils/test.py
Normal file
6
pastafaristats/utils/test.py
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
|
||||||
|
def stat(obj_stats):
|
||||||
|
|
||||||
|
obj_stats['test_data']={'pos': 0}
|
||||||
|
|
||||||
|
return obj_stats
|
||||||
Loading…
Add table
Add a link
Reference in a new issue