YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Correct English in monitor

Browse source
This commit is contained in:
Jerome Lebleu 2013-12-14 15:48:04 +01:00
parent a51c9fef39
commit bb027cd421
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
action_map.yml
View file

@ -539,7 +539,7 @@ monitor:
### monitor_updatestats() ### monitor_updatestats()
updatestats: updatestats:
action_help: Update monitored statistics action_help: Update monitoring statistics
api: POST /monitor/updatestats api: POST /monitor/updatestats
arguments: arguments:
period: period:
@ -551,7 +551,7 @@ monitor:
### monitor_showstats() ### monitor_showstats()
showstats: showstats:
action_help: Show monitored statistics action_help: Show monitoring statistics
api: GET /monitor/showstats api: GET /monitor/showstats
arguments: arguments:
period: period:

12
yunohost_monitor.py
View file

@ -236,7 +236,7 @@ def monitor_system(units=None, human_readable=False):
def monitor_updatestats(period): def monitor_updatestats(period):
""" """
Update monitored statistics Update monitoring statistics
Keyword argument: Keyword argument:
period -- Time period to update (day, week, month) period -- Time period to update (day, week, month)
@ -250,7 +250,7 @@ def monitor_updatestats(period):
stats = { 'disk': {}, 'network': {}, 'system': {}, 'timestamp': [] } stats = { 'disk': {}, 'network': {}, 'system': {}, 'timestamp': [] }
monitor = None monitor = None
# Get monitored stats # Get monitoring stats
if period == 'day': if period == 'day':
monitor = _monitor_all('day') monitor = _monitor_all('day')
else: else:
@ -261,7 +261,7 @@ def monitor_updatestats(period):
else: else:
monitor = _monitor_all(p, 0) monitor = _monitor_all(p, 0)
if not monitor: if not monitor:
raise YunoHostError(1, _("No monitored statistics to update")) raise YunoHostError(1, _("No monitoring statistics to update"))
stats['timestamp'].append(time.time()) stats['timestamp'].append(time.time())
@ -319,7 +319,7 @@ def monitor_updatestats(period):
def monitor_showstats(period, date=None): def monitor_showstats(period, date=None):
""" """
Show monitored statistics Show monitoring statistics
Keyword argument: Keyword argument:
period -- Time period to show (day, week, month) period -- Time period to show (day, week, month)
@ -573,11 +573,11 @@ def _calculate_stats_mean(stats):
def _append_to_stats(stats, monitor, statics=[]): def _append_to_stats(stats, monitor, statics=[]):
""" """
Append monitored statistics to current statistics Append monitoring statistics to current statistics
Keyword argument: Keyword argument:
stats -- Current stats dict stats -- Current stats dict
monitor -- Monitored statistics monitor -- Monitoring statistics
statics -- List of stats static keys statics -- List of stats static keys
""" """