From 30e6657d0e97024f8848449eb1c3aba9bfc130bd Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 24 Aug 2016 22:29:03 +0300 Subject: [PATCH] raspberrypi: monitor script: fixed tail missing -n argument --- .../raspberrypi/motioneye-modules/boardctl.py | 4 +- .../motioneye-modules/boardctl.py | 4 +- .../motioneye-modules/boardctl.py | 59 +------------------ 3 files changed, 6 insertions(+), 61 deletions(-) diff --git a/board/raspberrypi/motioneye-modules/boardctl.py b/board/raspberrypi/motioneye-modules/boardctl.py index d99d39fecf..289deb93a4 100644 --- a/board/raspberrypi/motioneye-modules/boardctl.py +++ b/board/raspberrypi/motioneye-modules/boardctl.py @@ -32,8 +32,8 @@ MONITOR_SCRIPT = '''#!/bin/bash net_tmp=/tmp/netspeed.tmp temp=$(($(cat /sys/devices/virtual/thermal/thermal_zone0/temp) / 1000)) load=$(cat /proc/loadavg | cut -d ' ' -f 2) -recv=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 3 | tail +3 | awk '{s+=$1} END {print s}') -send=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 11 | tail +3 | awk '{s+=$1} END {print s}') +recv=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 3 | tail -n +3 | awk '{s+=$1} END {print s}') +send=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 11 | tail -n +3 | awk '{s+=$1} END {print s}') total=$(($recv + $send)) if [ -e $net_tmp ]; then diff --git a/board/raspberrypi2/motioneye-modules/boardctl.py b/board/raspberrypi2/motioneye-modules/boardctl.py index 1b083345ef..c162502ced 100644 --- a/board/raspberrypi2/motioneye-modules/boardctl.py +++ b/board/raspberrypi2/motioneye-modules/boardctl.py @@ -31,8 +31,8 @@ MONITOR_SCRIPT = '''#!/bin/bash net_tmp=/tmp/netspeed.tmp temp=$(($(cat /sys/devices/virtual/thermal/thermal_zone0/temp) / 1000)) load=$(cat /proc/loadavg | cut -d ' ' -f 2) -recv=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 3 | tail +3 | awk '{s+=$1} END {print s}') -send=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 11 | tail +3 | awk '{s+=$1} END {print s}') +recv=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 3 | tail -n +3 | awk '{s+=$1} END {print s}') +send=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 11 | tail -n +3 | awk '{s+=$1} END {print s}') total=$(($recv + $send)) if [ -e $net_tmp ]; then diff --git a/board/raspberrypi3/motioneye-modules/boardctl.py b/board/raspberrypi3/motioneye-modules/boardctl.py index c314ae47f1..9fdfa06e54 100644 --- a/board/raspberrypi3/motioneye-modules/boardctl.py +++ b/board/raspberrypi3/motioneye-modules/boardctl.py @@ -31,8 +31,8 @@ MONITOR_SCRIPT = '''#!/bin/bash net_tmp=/tmp/netspeed.tmp temp=$(($(cat /sys/devices/virtual/thermal/thermal_zone0/temp) / 1000)) load=$(cat /proc/loadavg | cut -d ' ' -f 2) -recv=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 3 | tail +3 | awk '{s+=$1} END {print s}') -send=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 11 | tail +3 | awk '{s+=$1} END {print s}') +recv=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 3 | tail -n +3 | awk '{s+=$1} END {print s}') +send=$(cat /proc/net/dev | grep -v 'lo:' | tr -s ' ' | cut -d ' ' -f 11 | tail -n +3 | awk '{s+=$1} END {print s}') total=$(($recv + $send)) if [ -e $net_tmp ]; then @@ -88,15 +88,12 @@ def _get_board_settings(): elif name == 'disable_camera_led': camera_led = value == '0' - #overclock = OVERCLOCK.get(arm_freq, '700|250|400|0') s = { 'gpuMem': gpu_mem, - #'overclock': overclock, 'cameraLed': camera_led } - #logging.debug('board settings: gpu_mem=%(gpuMem)s, overclock=%(overclock)s, camera_led=%(cameraLed)s' % s) logging.debug('board settings: gpu_mem=%(gpuMem)s, camera_led=%(cameraLed)s' % s) return s @@ -104,7 +101,6 @@ def _get_board_settings(): def _set_board_settings(s): s.setdefault('gpuMem', 128) - #s.setdefault('overclock', '700|250|400|0') s.setdefault('cameraLed', True) old_settings = _get_board_settings() @@ -113,12 +109,8 @@ def _set_board_settings(s): seen = set() - #logging.debug('writing board settings to %s: ' % CONFIG_TXT + - # 'gpu_mem=%(gpuMem)s, overclock=%(overclock)s, camera_led=%(cameraLed)s' % s) logging.debug('writing board settings to %s: ' % CONFIG_TXT + 'gpu_mem=%(gpuMem)s, camera_led=%(cameraLed)s' % s) - - #arm_freq, gpu_freq, sdram_freq, over_voltage = s['overclock'].split('|') lines = [] if os.path.exists(CONFIG_TXT): @@ -144,36 +136,12 @@ def _set_board_settings(s): if name == 'gpu_mem': lines[i] = '%s=%s' % (name, s['gpuMem']) - #elif name == 'arm_freq': - # lines[i] = 'arm_freq=%s' % arm_freq - # - #elif name in ['gpu_freq', 'core_freq']: - # lines[i] = '%s=%s' % (name, gpu_freq) - # - #elif name == 'sdram_freq': - # lines[i] = 'sdram_freq=%s' % sdram_freq - # - #elif name == 'over_voltage': - # lines[i] = 'over_voltage=%s' % over_voltage - elif name == 'disable_camera_led': lines[i] = 'disable_camera_led=%s' % ['1', '0'][s['cameraLed']] if 'gpu_mem' not in seen: lines.append('gpu_mem=%s' % s['gpuMem']) - #if 'arm_freq' not in seen: - # lines.append('arm_freq=%s' % arm_freq) - - #if 'gpu_freq' not in seen: - # lines.append('gpu_freq=%s' % gpu_freq) - - #if 'sdram_freq' not in seen: - # lines.append('sdram_freq=%s' % sdram_freq) - - #if 'over_voltage' not in seen: - # lines.append('over_voltage=%s' % over_voltage) - if 'disable_camera_led' not in seen: lines.append('disable_camera_led=%s' % ['1', '0'][s['cameraLed']]) @@ -255,29 +223,6 @@ def cameraLed(): } -#@additional_config -#def overclock(): -# return { -# 'label': 'Overclocking', -# 'description': 'choose an overclocking preset for your Raspberry PI', -# 'type': 'choices', -# 'choices': [ -# ('700|250|400|0', 'none (700/250/400/0)'), -# ('800|250|400|0', 'modest (800/250/400/0)'), -# ('900|250|450|0', 'medium (900/250/450/0)'), -# ('950|250|450|0', 'high (950/250/450/0)'), -# ('1000|500|600|6', 'turbo (1000/500/600/6)'), -# ('1001|500|500|2', 'Pi2 (1000/500/500/2)') -# ], -# 'section': 'expertSettings', -# 'advanced': True, -# 'reboot': True, -# 'get': _get_board_settings, -# 'set': _set_board_settings, -# 'get_set_dict': True -# } - - @additional_config def sysMon(): return {