Starting update via service-runner-update.sh (v2.0) > - emonSD version: emonSD-30Oct18 emonSD base image check passed...continue update git pull /home/pi/emonpi enable-ssh enable-ssh-button gpiozero-enable-ssh greeebs-patch-1 * master python-systemd-servicerunner On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working tree clean Already up-to-date. ------------------------------------------------------------- Main Update Script ------------------------------------------------------------- Date: Fri 21 Feb 16:59:22 UTC 2020 EUID: 1000 usrdir: /home/pi type: all firmware: custom Checking environment: - pi user found EUID: 1000 Hardware detected: EmonPi Stopping emonPiLCD service Display update message on LCD I2C LCD DETECTED Ox27 ------------------------------------------------------------- Get:1 http://archive.raspberrypi.org/debian stretch InRelease [25.4 kB] Get:2 http://raspbian.raspberrypi.org/raspbian stretch InRelease [15.0 kB] Get:3 http://raspbian.raspberrypi.org/raspbian stretch/main armhf Packages [11.7 MB] Get:4 http://archive.raspberrypi.org/debian stretch/main armhf Packages [220 kB] Get:5 http://archive.raspberrypi.org/debian stretch/ui armhf Packages [45.0 kB] Get:6 http://raspbian.raspberrypi.org/raspbian stretch/contrib armhf Packages [56.9 kB] Get:7 http://raspbian.raspberrypi.org/raspbian stretch/non-free armhf Packages [95.5 kB] Fetched 12.1 MB in 19s (613 kB/s) Reading package lists... Reading package lists... Building dependency tree... Reading state information... python-rpi.gpio is already the newest version (0.6.5~stretch-1). Suggested packages: python-gpiozero-docs The following NEW packages will be installed: python-colorzero rng-tools The following packages will be upgraded: python-gpiozero 1 upgraded, 2 newly installed, 0 to remove and 154 not upgraded. Need to get 159 kB of archives. After this operation, 420 kB of additional disk space will be used. Get:1 http://archive.raspberrypi.org/debian stretch/main armhf python-colorzero all 1.1 [21.7 kB] Get:3 http://archive.raspberrypi.org/debian stretch/main armhf python-gpiozero all 1.5.0 [88.2 kB] Get:2 http://archive-bm.raspbian.org/raspbian stretch/main armhf rng-tools armhf 2-unofficial-mt.14-1 [48.7 kB] apt-listchanges: Reading changelogs... debconf: unable to initialize frontend: Dialog debconf: (Dialog frontend will not work on a dumb terminal, an emacs shell buffer, or without a controlling terminal.) debconf: falling back to frontend: Readline debconf: unable to initialize frontend: Readline debconf: (This frontend requires a controlling tty.) debconf: falling back to frontend: Teletype dpkg-preconfigure: unable to re-open stdin: Fetched 159 kB in 0s (224 kB/s) Selecting previously unselected package rng-tools. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 46885 files and directories currently installed.) Preparing to unpack .../rng-tools_2-unofficial-mt.14-1_armhf.deb ... Unpacking rng-tools (2-unofficial-mt.14-1) ... Selecting previously unselected package python-colorzero. Preparing to unpack .../python-colorzero_1.1_all.deb ... Unpacking python-colorzero (1.1) ... Preparing to unpack .../python-gpiozero_1.5.0_all.deb ... Unpacking python-gpiozero (1.5.0) over (1.4.1) ... Setting up rng-tools (2-unofficial-mt.14-1) ... Processing triggers for systemd (232-25+deb9u4) ... Setting up python-colorzero (1.1) ... Processing triggers for man-db (2.7.6.1-2) ... Setting up python-gpiozero (1.5.0) ... Collecting paho-mqtt Downloading https://files.pythonhosted.org/packages/59/11/1dd5c70f0f27a88a3a05772cd95f6087ac479fac66d9c7752ee5e16ddbbc/paho-mqtt-1.5.0.tar.gz (99kB) Building wheels for collected packages: paho-mqtt Running setup.py bdist_wheel for paho-mqtt: started Running setup.py bdist_wheel for paho-mqtt: finished with status 'done' Stored in directory: /root/.cache/pip/wheels/02/94/6c/8474137cb7a5a3e001d70a22c8ff919caee69435376bccce79 Successfully built paho-mqtt Installing collected packages: paho-mqtt Found existing installation: paho-mqtt 1.4.0 Uninstalling paho-mqtt-1.4.0: Successfully uninstalled paho-mqtt-1.4.0 Successfully installed paho-mqtt-1.5.0 ------------------------------------------------------------- git pull /home/pi/RFM2Pi * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working tree clean Already up-to-date. git pull /home/pi/usefulscripts * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working tree clean Already up-to-date. git pull /home/pi/huawei-hilink-status * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working tree clean Already up-to-date. git pull /home/pi/oem_node-red * master On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working tree clean Already up-to-date. Start emonhub update script: ------------------------------------------------------------- emonHub update started ------------------------------------------------------------- - usr directory: /home/pi git pull /home/pi/emonhub * emon-pi On branch emon-pi Your branch is up-to-date with 'origin/emon-pi'. nothing to commit, working tree clean Already up-to-date. Creating emonhub logfile Symlinking emonhub.conf to /etc/emonhub/emonhub.conf removing initd emonhub service Fatal: cannot find /usr/share/emonhub/emonhub.py Installing emonhub.service in /lib/systemd/system (creating symlink) Created symlink /etc/systemd/system/multi-user.target.wants/emonhub.service → /home/pi/emonhub/service/emonhub.service. Created symlink /etc/systemd/system/emonhub.service → /home/pi/emonhub/service/emonhub.service. Running emonhub automatic node addition script [[5]] Node 5 already present [[6]] Node 6 already present [[7]] Node 7 already present [[8]] Node 8 already present [[9]] Node 9 already present [[10]] Node 10 already present [[11]] Node 11 already present [[12]] Node 12 already present [[13]] Node 13 already present [[14]] Node 14 already present Added node 15 to emonhub.conf Added node 16 to emonhub.conf [[19]] Node 19 already present [[20]] Node 20 already present [[21]] Node 21 already present [[22]] Node 22 already present [[23]] Node 23 already present [[24]] Node 24 already present [[25]] Node 25 already present [[26]] Node 26 already present Start emoncms update: ------------------------------------------------------------- Emoncms update started Emoncms update script V1.3 (26th March 2019) ------------------------------------------------------------- - usr directory: /home/pi - emoncms directory: /var/www/emoncms current settings.php md5: bfcadb4356440ffc96c06a5d91aa2a02 Default settings.php md5: bfcadb4356440ffc96c06a5d91aa2a02 settings.php has NOT been user modifed Checking status of /var/www/emoncms git repository Fetching origin From https://github.com/emoncms/emoncms - [deleted] (none) -> origin/fix_cleardata_feed_issue - [deleted] (none) -> origin/hierarchical_settings_php - [deleted] (none) -> origin/low-write - [deleted] (none) -> origin/pb66-patch-1 - [deleted] (none) -> origin/pb66-patch-2 - [deleted] (none) -> origin/pb66-patch-3 - [deleted] (none) -> origin/pb66-patch-phpmqtt_input - [deleted] (none) -> origin/restructure - [deleted] (none) -> origin/service-status - [deleted] (none) -> origin/systmdRunner 59723e7c..d2e08a9e stable -> origin/stable * [new branch] emonmuc -> origin/emonmuc c794f2a6..95854c2c indexedinputs -> origin/indexedinputs * [new branch] logrotate -> origin/logrotate 1c2d2c70..f4b9c015 master -> origin/master 410ee04d..123f3dfa mqtt -> origin/mqtt 97d5316e..03978db5 mqttauth -> origin/mqttauth * [new tag] 10.2.0 -> 10.2.0 * [new tag] 10.0.0 -> 10.0.0 * [new tag] 10.0.2 -> 10.0.2 * [new tag] 10.1.0 -> 10.1.0 * [new tag] 10.1.1 -> 10.1.1 * [new tag] 10.1.10 -> 10.1.10 * [new tag] 10.1.11 -> 10.1.11 * [new tag] 10.1.2 -> 10.1.2 * [new tag] 10.1.3 -> 10.1.3 * [new tag] 10.1.4 -> 10.1.4 * [new tag] 10.1.5 -> 10.1.5 * [new tag] 10.1.6 -> 10.1.6 * [new tag] 10.1.7 -> 10.1.7 * [new tag] 10.1.8 -> 10.1.8 * [new tag] 10.1.9 -> 10.1.9 * [new tag] 9.9.6 -> 9.9.6 * [new tag] 9.9.7 -> 9.9.7 * [new tag] 9.9.8 -> 9.9.8 * [new tag] 9.9.9 -> 9.9.9 - git branch: stable - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating 59723e7c..d2e08a9e Fast-forward .gitignore | 3 +- .htaccess | 11 +- .travis.yml | 94 +- COPYRIGHT.txt | 2 +- Lib/EmonLogger.php | 11 +- Lib/email.php | 17 +- Lib/emoncms.js | 119 ++ Lib/gridjs/grid-demo.php | 719 ++++++++ Lib/gridjs/grid.html | 293 ++++ Lib/gridjs/grid.js | 111 ++ Lib/jquery-1.11.3.min.js | 2 +- Lib/misc/autocomplete.css | 34 + Lib/misc/autocomplete.js | 86 + Lib/misc/gettext.js | 55 + Lib/misc/nav_functions.php | 1026 ++++++++++++ Lib/misc/sidebar.css | 486 +++++- Lib/misc/sidebar.js | 411 ++++- Lib/process_old_settings.php | 204 +++ Lib/responsive-linked-tables.js | 74 +- Lib/tablejs/custom-table-fields.js | 27 +- Lib/units.php | 4 +- Lib/user_locale.js | 28 + Lib/vue.min.js | 6 + Modules/admin/admin_controller.php | 422 +++-- Modules/admin/admin_db_view.php | 23 - Modules/admin/admin_main_view.php | 1246 ++++++++------ Modules/admin/admin_menu.php | 19 +- Modules/admin/admin_model.php | 452 +++++ Modules/admin/locale/cy_GB/LC_MESSAGES/messages.mo | Bin 0 -> 986 bytes Modules/admin/locale/cy_GB/LC_MESSAGES/messages.po | 738 +++++++++ Modules/admin/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 3710 -> 6705 bytes Modules/admin/locale/fr_FR/LC_MESSAGES/messages.po | 459 ++++- Modules/admin/pi-model.json | 142 +- Modules/admin/static/admin_styles.css | 183 ++ Modules/admin/update_view.php | 3 +- Modules/admin/userlist_view.php | 7 +- Modules/eventp/eventp_processlist.php | 4 +- Modules/feed/Views/feedlist_view.php | 1746 ++++++++++++++------ Modules/feed/Views/feedlist_view_v2.php | 1298 --------------- Modules/feed/engine/CassandraEngine.php | 15 +- Modules/feed/engine/Histogram.php | 16 + Modules/feed/engine/MysqlTimeSeries.php | 24 +- Modules/feed/engine/PHPFina.php | 212 ++- Modules/feed/engine/PHPFiwa.php | 11 +- Modules/feed/engine/PHPTimeSeries.php | 17 +- Modules/feed/engine/RedisBuffer.php | 19 +- Modules/feed/engine/TemplateEngine.php | 10 +- Modules/feed/engine/VirtualFeed.php | 18 +- Modules/feed/feed.js | 7 + Modules/feed/feed_controller.php | 227 ++- Modules/feed/feed_menu.php | 11 +- Modules/feed/feed_model.php | 96 +- Modules/feed/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 12939 -> 13991 bytes Modules/feed/locale/fr_FR/LC_MESSAGES/messages.po | 598 ++++--- Modules/input/Views/device_view.php | 645 -------- Modules/input/Views/input.js | 6 + Modules/input/Views/input_api.php | 2 +- Modules/input/Views/input_dialog.php | 167 +- Modules/input/Views/input_view.js | 1398 ++++++++++++++++ Modules/input/Views/input_view.php | 462 ++++-- Modules/input/Views/schedule.php | 1 - Modules/input/input_controller.php | 198 +-- Modules/input/input_menu.php | 25 +- Modules/input/input_methods.php | 21 +- Modules/input/input_model.php | 23 +- Modules/input/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 14290 -> 15818 bytes Modules/input/locale/fr_FR/LC_MESSAGES/messages.po | 253 ++- Modules/input/que_input_controller.php | 6 +- Modules/process/Views/process_api.php | 4 +- Modules/process/Views/process_ui.js | 36 +- Modules/process/Views/process_ui.php | 86 +- .../locale/fr_FR/LC_MESSAGES/process_messages.mo | Bin 26277 -> 26825 bytes .../locale/fr_FR/LC_MESSAGES/process_messages.po | 142 +- Modules/process/process_controller.php | 4 +- Modules/process/process_model.php | 32 +- Modules/process/process_processlist.php | 95 +- Modules/schedule/Views/schedule_api.php | 4 +- Modules/schedule/Views/schedule_view.php | 14 +- Modules/schedule/schedule_menu.php | 13 +- Modules/schedule/schedule_model.php | 4 +- Modules/user/Views/bookmarks.php | 257 +++ Modules/user/Views/sidebar.php | 3 + Modules/user/deleteuser.php | 4 +- Modules/user/locale/cy_GB/LC_MESSAGES/messages.mo | Bin 3015 -> 4653 bytes Modules/user/locale/cy_GB/LC_MESSAGES/messages.po | 441 +++-- Modules/user/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 7664 -> 7745 bytes Modules/user/locale/fr_FR/LC_MESSAGES/messages.po | 265 +-- Modules/user/login_block.php | 62 +- Modules/user/profile/profile.php | 8 +- Modules/user/user.js | 10 +- Modules/user/user_controller.php | 83 +- Modules/user/user_menu.php | 48 +- Modules/user/user_model.php | 217 ++- Modules/user/user_schema.php | 2 +- Modules/vis/README.md | 38 + Modules/vis/Views/vis_main_view.php | 11 +- .../vis/locale/fr_FR/LC_MESSAGES/vis_messages.mo | Bin 11922 -> 13087 bytes .../vis/locale/fr_FR/LC_MESSAGES/vis_messages.po | 374 +++-- Modules/vis/multigraph_model.php | 4 +- Modules/vis/vis_controller.php | 4 +- Modules/vis/vis_langjs.php | 1 + Modules/vis/vis_menu.php | 13 +- Modules/vis/vis_object.php | 73 +- Modules/vis/visualisations/bargraph.php | 98 +- Modules/vis/visualisations/compare.php | 7 +- .../vis/visualisations/comparison/comparison.php | 1 - .../dailyhistogram/dailyhistogram.php | 1 - Modules/vis/visualisations/editdaily.php | 3 +- Modules/vis/visualisations/editrealtime.php | 62 +- Modules/vis/visualisations/graph.js | 6 +- Modules/vis/visualisations/graph.php | 49 +- Modules/vis/visualisations/histgraph.php | 13 +- Modules/vis/visualisations/multigraph.php | 87 +- .../vis/visualisations/multigraph/multigraph.js | 295 ++-- Modules/vis/visualisations/orderbars.php | 7 +- Modules/vis/visualisations/orderthreshold.php | 7 +- Modules/vis/visualisations/rawdata.php | 12 +- Modules/vis/visualisations/realtime.php | 25 +- Modules/vis/visualisations/simplezoom.php | 7 +- Modules/vis/visualisations/smoothie.php | 13 +- Modules/vis/visualisations/stacked.php | 7 +- Modules/vis/visualisations/stackedsolar.php | 9 +- Modules/vis/visualisations/threshold.php | 7 +- Modules/vis/visualisations/timecompare.php | 1 - .../vis/visualisations/timecompare/timecompare.js | 8 +- Modules/vis/visualisations/timestoredaily.php | 8 +- Modules/vis/visualisations/zoom.php | 7 +- Modules/vis/widget/vis_render.js | 120 +- Modules/vis/widget/vis_widget.php | 4 +- Theme/basic/embed.php | 25 +- Theme/basic/emon-blue.css | 158 +- Theme/basic/emon-standard.css | 149 +- Theme/basic/emon-sun.css | 109 +- Theme/basic/emoncms-base.css | 505 ++++++ .../locale/fr_FR/LC_MESSAGES/theme_messages.mo | Bin 0 -> 948 bytes .../locale/fr_FR/LC_MESSAGES/theme_messages.po | 54 + Theme/basic/menu_view.php | 299 ++-- Theme/basic/sidebar_view.php | 230 +++ Theme/basic/svg_icons.svg | 177 ++ Theme/basic/theme.php | 324 +--- composer.json | 16 +- composer.lock | 120 -- core.php | 146 +- default-settings.ini | 204 +++ default-settings.php | 210 +++ default.emonpi.settings.php | 7 +- default.settings.php | 183 -- docs/DebianInstall.md | 6 +- docs/LinuxInstall.md | 62 +- docs/RaspberryPi/Low-write-mode.md | 16 +- docs/RaspberryPi/MQTT.md | 32 +- docs/RaspberryPi/general.md | 15 +- docs/RaspberryPi/install_Wheezy.md | 10 +- docs/RaspberryPi/jessie.md | 10 +- docs/RaspberryPi/read-only.md | 18 +- docs/RaspberryPi/readme.md | 43 +- docs/SharedLinuxHostingInstall.md | 7 +- docs/Update.md | 52 + docs/Upgrading.md | 76 +- docs/WindowsInstall.md | 22 +- docs/files/emoncms_update.png | Bin 0 -> 78097 bytes docs/gettext.md | 4 + example.settings.ini | 71 + example.settings.php | 86 + index.php | 191 ++- locale.php | 52 +- logconfig.xml | 9 - param.php | 12 +- process_settings.php | 223 ++- readme.md | 61 +- route.php | 8 +- scripts/feedwriter.php | 37 +- scripts/logger/install.sh | 25 +- scripts/logger/logrotate | 3 +- scripts/logger/logrotate.conf | 4 +- scripts/mqtt_input.service | 2 +- scripts/phpmqtt_input.php | 109 +- scripts/services/emoncms_mqtt/emoncms_mqtt.php | 394 +++++ scripts/services/emoncms_mqtt/emoncms_mqtt.service | 71 + scripts/services/feedwriter/feedwriter.service | 71 + scripts/services/install-service-emoncmsmqtt.md | 23 + scripts/services/install-service-feedwriter.md | 24 + scripts/services/install-service-runner-update.md | 34 +- scripts/services/service-runner/service-runner.py | 56 +- .../services/service-runner/service-runner.service | 11 +- settings.env.ini | 14 + tests/Lib/emoncms_tests_helper.js | 3 +- version.txt | 2 +- 188 files changed, 16401 insertions(+), 6753 deletions(-) create mode 100644 Lib/emoncms.js create mode 100644 Lib/gridjs/grid-demo.php create mode 100644 Lib/gridjs/grid.html create mode 100644 Lib/gridjs/grid.js create mode 100644 Lib/misc/autocomplete.css create mode 100644 Lib/misc/autocomplete.js create mode 100644 Lib/misc/gettext.js create mode 100644 Lib/misc/nav_functions.php create mode 100644 Lib/process_old_settings.php create mode 100644 Lib/user_locale.js create mode 100644 Lib/vue.min.js delete mode 100644 Modules/admin/admin_db_view.php create mode 100644 Modules/admin/admin_model.php create mode 100644 Modules/admin/locale/cy_GB/LC_MESSAGES/messages.mo create mode 100644 Modules/admin/locale/cy_GB/LC_MESSAGES/messages.po create mode 100644 Modules/admin/static/admin_styles.css delete mode 100644 Modules/feed/Views/feedlist_view_v2.php delete mode 100644 Modules/input/Views/device_view.php create mode 100644 Modules/input/Views/input_view.js create mode 100644 Modules/user/Views/bookmarks.php create mode 100644 Modules/user/Views/sidebar.php create mode 100644 Modules/vis/README.md create mode 100644 Theme/basic/emoncms-base.css create mode 100644 Theme/basic/locale/fr_FR/LC_MESSAGES/theme_messages.mo create mode 100644 Theme/basic/locale/fr_FR/LC_MESSAGES/theme_messages.po create mode 100644 Theme/basic/sidebar_view.php create mode 100644 Theme/basic/svg_icons.svg delete mode 100644 composer.lock create mode 100644 default-settings.ini create mode 100644 default-settings.php delete mode 100644 default.settings.php create mode 100644 docs/Update.md create mode 100644 docs/files/emoncms_update.png create mode 100644 example.settings.ini create mode 100644 example.settings.php delete mode 100644 logconfig.xml create mode 100644 scripts/services/emoncms_mqtt/emoncms_mqtt.php create mode 100644 scripts/services/emoncms_mqtt/emoncms_mqtt.service create mode 100644 scripts/services/feedwriter/feedwriter.service create mode 100644 scripts/services/install-service-emoncmsmqtt.md create mode 100644 scripts/services/install-service-feedwriter.md create mode 100644 settings.env.ini NEW default settings.php md5: 59e80f731935867f5f93753d49c0fe86 Update required to settings.php... settings.php autoupdated ------------------------------------------------------------- Updating Emoncms Modules ------------------------------------------------------------- ------------------------------------------ Updating /var/www/emoncms/Modules/app module ------------------------------------------ Fetching origin From https://github.com/emoncms/app 3fbdf07..54be5d1 stable -> origin/stable 0692abe..ccf8bdc master -> origin/master * [new branch] octopus_outgoing -> origin/octopus_outgoing * [new tag] 2.1.0 -> 2.1.0 * [new tag] 1.2.1 -> 1.2.1 * [new tag] 2.0.0 -> 2.0.0 * [new tag] 2.0.1 -> 2.0.1 - git branch: stable - git tags: 1.2.0-2-g3fbdf07 - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating 3fbdf07..54be5d1 Fast-forward .travis.yml | 13 + LICENSE.txt | 619 ++++++++++++++++++ Lib/config.js | 125 +++- Lib/feed.js | 14 +- Lib/timeseries.js | 4 + Lib/vis.helper.js | 10 +- Views/app_sidebar.php | 82 --- Views/app_view.php | 90 +-- Views/css/app.css | 139 +++++ Views/css/config.css | 17 +- Views/css/dark.css | 213 ++++--- Views/css/pagenav.css | 69 -- Views/js/app.js | 12 + app_controller.php | 27 +- app_menu.php | 67 +- app_model.php | 24 +- apps/OpenEnergyMonitor/config-nav.php | 4 + .../costcomparison/costcomparison.php | 59 +- apps/OpenEnergyMonitor/costcomparison/rates.js | 86 +++ apps/OpenEnergyMonitor/graph-nav.php | 12 + apps/OpenEnergyMonitor/myelectric/myelectric.php | 358 ++++++----- apps/OpenEnergyMonitor/myelectric2/myelectric2.php | 94 +-- apps/OpenEnergyMonitor/myenergy/myenergy.php | 281 ++++----- apps/OpenEnergyMonitor/myheatpump/myheatpump.php | 38 +- apps/OpenEnergyMonitor/mysolarpv/mysolarpv.php | 610 +++++++++++------- apps/OpenEnergyMonitor/mysolarpvdivert/app.json | 4 +- .../mysolarpvdivert/mysolarpvdivert.php | 503 +++++++-------- apps/OpenEnergyMonitor/octopus/app.json | 5 + apps/OpenEnergyMonitor/octopus/octopus.php | 694 +++++++++++++++++++++ apps/OpenEnergyMonitor/openevse/app.json | 5 - apps/OpenEnergyMonitor/openevse/openevse.php | 618 ------------------ apps/OpenEnergyMonitor/timeofuse/timeofuse.php | 70 ++- apps/OpenEnergyMonitor/timeofuse2/timeofuse2.php | 131 ++-- apps/OpenEnergyMonitor/timeofusecl/timeofusecl.php | 112 ++-- apps/blank/blank.php | 4 +- apps/template/template.php | 4 +- composer.json | 15 + images/agile_app.png | Bin 0 -> 116149 bytes module.json | 2 +- 39 files changed, 3220 insertions(+), 2014 deletions(-) create mode 100644 .travis.yml create mode 100644 LICENSE.txt delete mode 100644 Views/app_sidebar.php create mode 100644 Views/css/app.css delete mode 100644 Views/css/pagenav.css create mode 100644 Views/js/app.js create mode 100644 apps/OpenEnergyMonitor/config-nav.php create mode 100644 apps/OpenEnergyMonitor/graph-nav.php create mode 100644 apps/OpenEnergyMonitor/octopus/app.json create mode 100644 apps/OpenEnergyMonitor/octopus/octopus.php delete mode 100644 apps/OpenEnergyMonitor/openevse/app.json delete mode 100644 apps/OpenEnergyMonitor/openevse/openevse.php create mode 100644 composer.json create mode 100644 images/agile_app.png ------------------------------------------ Updating /var/www/emoncms/Modules/config module ------------------------------------------ Fetching origin From https://github.com/emoncms/config 486d4d3..1bba25a stable -> origin/stable f38b465..1bba25a master -> origin/master * [new tag] 1.1.0 -> 1.1.0 * [new tag] 2.0.0 -> 2.0.0 * [new tag] 2.0.1 -> 2.0.1 * [new tag] 2.0.2 -> 2.0.2 - git branch: stable - git tags: 1.0.0-3-g486d4d3 - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating 486d4d3..1bba25a Fast-forward README.md | 6 + Views/tabs.php | 7 + calibration.php | 387 ++ config_controller.php | 145 +- config_menu.php | 37 +- config_model.php | 65 + connect.php | 69 + edit.php | 145 - editor.php | 157 + module.json | 2 +- restart.sh | 6 + sidebar.php | 7 + style.css | 92 + view.php | 271 ++ vue.js | 10947 ++++++++++++++++++++++++++++++++++++++++++++++++ 15 files changed, 12174 insertions(+), 169 deletions(-) create mode 100644 Views/tabs.php create mode 100644 calibration.php create mode 100644 config_model.php create mode 100644 connect.php delete mode 100644 edit.php create mode 100644 editor.php create mode 100755 restart.sh create mode 100644 sidebar.php create mode 100644 style.css create mode 100644 view.php create mode 100644 vue.js ------------------------------------------ Updating /var/www/emoncms/Modules/dashboard module ------------------------------------------ Fetching origin From https://github.com/emoncms/dashboard 9b03e57..ec86b80 stable -> origin/stable c1ae9f6..678def6 master -> origin/master * [new tag] 2.0.5 -> 2.0.5 * [new tag] 1.3.2 -> 1.3.2 * [new tag] 1.3.3 -> 1.3.3 * [new tag] 2.0.0 -> 2.0.0 * [new tag] 2.0.1 -> 2.0.1 * [new tag] 2.0.2 -> 2.0.2 * [new tag] 2.0.3 -> 2.0.3 - git branch: stable - git tags: 1.3.1-1-g9b03e57 - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating 9b03e57..ec86b80 Fast-forward .travis.yml | 13 + Readme.md | 2 + Views/dashboard_config.php | 43 +- Views/dashboard_edit_view.php | 40 +- Views/dashboard_list.old.php | 125 ++ Views/dashboard_list.php | 759 ++++++++++-- Views/dashboard_view.php | 48 +- Views/dashboardeditor.css | 1 - Views/js/designer.js | 76 +- Views/loadwidgets.php | 2 +- composer.json | 16 + dashboard.js | 132 +++ dashboard_controller.php | 40 +- dashboard_langjs.php | 14 +- dashboard_menu.php | 69 +- dashboard_model.php | 54 +- dashboard_schema.php | 1 + locale/cy_GB/LC_MESSAGES/dashboard_messages.mo | Bin 0 -> 1067 bytes locale/cy_GB/LC_MESSAGES/dashboard_messages.po | 1203 ++++++++++++++++++++ .../{messages.mo => dashboard_messages.mo} | Bin .../{messages.po => dashboard_messages.po} | 0 .../{messages.mo => dashboard_messages.mo} | Bin .../{messages.po => dashboard_messages.po} | 0 .../{messages.mo => dashboard_messages.mo} | Bin 518 -> 512 bytes locale/en_GB/LC_MESSAGES/dashboard_messages.po | 1105 ++++++++++++++++++ locale/en_GB/LC_MESSAGES/messages.po | 452 -------- .../{messages.mo => dashboard_messages.mo} | Bin .../{messages.po => dashboard_messages.po} | 0 .../{messages.mo => dashboard_messages.mo} | Bin .../{messages.po => dashboard_messages.po} | 0 locale/fr_FR/LC_MESSAGES/dashboard_messages.mo | Bin 0 -> 17677 bytes .../{messages.po => dashboard_messages.po} | 853 ++++++++------ locale/fr_FR/LC_MESSAGES/messages.mo | Bin 14689 -> 0 bytes .../{messages.mo => dashboard_messages.mo} | Bin .../{messages.po => dashboard_messages.po} | 0 .../{messages.mo => dashboard_messages.mo} | Bin .../{messages.po => dashboard_messages.po} | 0 .../{messages.mo => dashboard_messages.mo} | Bin .../{messages.po => dashboard_messages.po} | 0 module.json | 2 +- widget/bar/bar_render.js | 45 +- widget/bar/bar_widget.php | 15 - widget/battery/battery_render.js | 64 +- widget/button/button_render.js | 28 +- widget/curl/curl_render.js | 2 +- widget/dewpoint/dewpoint_render.js | 43 +- widget/dial/dial_render.js | 46 +- widget/dial/dial_widget.php | 15 - widget/feedtime/feedtime_render.js | 65 +- widget/feedtime/feedtime_widget.php | 15 - widget/feedvalue/feedvalue_render.js | 21 +- widget/feedvalue/feedvalue_widget.php | 15 - widget/frostpoint/frostpoint_render.js | 48 +- widget/heatindex/heatindex_render.js | 41 +- widget/humidex/humidex_render.js | 49 +- widget/isactivefeed/isactivefeed_widget.php | 15 - widget/jgauge/jgauge_render.js | 41 +- widget/jgauge2/jgauge2_render.js | 42 +- widget/kwhperiod/kwhperiod_render.js | 864 ++++++++++++++ widget/signal/signal_render.js | 59 +- widget/sun/sun_render.js | 57 +- widget/thermometer/thermometer_render.js | 60 +- widget/thresholds/thresholds_render.js | 18 +- 63 files changed, 5354 insertions(+), 1364 deletions(-) create mode 100644 .travis.yml create mode 100644 Views/dashboard_list.old.php create mode 100644 composer.json create mode 100644 locale/cy_GB/LC_MESSAGES/dashboard_messages.mo create mode 100644 locale/cy_GB/LC_MESSAGES/dashboard_messages.po rename locale/da_DK/LC_MESSAGES/{messages.mo => dashboard_messages.mo} (100%) rename locale/da_DK/LC_MESSAGES/{messages.po => dashboard_messages.po} (100%) rename locale/de_DE/LC_MESSAGES/{messages.mo => dashboard_messages.mo} (100%) rename locale/de_DE/LC_MESSAGES/{messages.po => dashboard_messages.po} (100%) rename locale/en_GB/LC_MESSAGES/{messages.mo => dashboard_messages.mo} (63%) create mode 100644 locale/en_GB/LC_MESSAGES/dashboard_messages.po delete mode 100644 locale/en_GB/LC_MESSAGES/messages.po rename locale/es_ES/LC_MESSAGES/{messages.mo => dashboard_messages.mo} (100%) rename locale/es_ES/LC_MESSAGES/{messages.po => dashboard_messages.po} (100%) rename locale/et_EE/LC_MESSAGES/{messages.mo => dashboard_messages.mo} (100%) rename locale/et_EE/LC_MESSAGES/{messages.po => dashboard_messages.po} (100%) create mode 100644 locale/fr_FR/LC_MESSAGES/dashboard_messages.mo rename locale/fr_FR/LC_MESSAGES/{messages.po => dashboard_messages.po} (66%) delete mode 100644 locale/fr_FR/LC_MESSAGES/messages.mo rename locale/it_IT/LC_MESSAGES/{messages.mo => dashboard_messages.mo} (100%) rename locale/it_IT/LC_MESSAGES/{messages.po => dashboard_messages.po} (100%) rename locale/nl_BE/LC_MESSAGES/{messages.mo => dashboard_messages.mo} (100%) rename locale/nl_BE/LC_MESSAGES/{messages.po => dashboard_messages.po} (100%) rename locale/nl_NL/LC_MESSAGES/{messages.mo => dashboard_messages.mo} (100%) rename locale/nl_NL/LC_MESSAGES/{messages.po => dashboard_messages.po} (100%) delete mode 100644 widget/bar/bar_widget.php delete mode 100644 widget/dial/dial_widget.php delete mode 100644 widget/feedtime/feedtime_widget.php delete mode 100644 widget/feedvalue/feedvalue_widget.php delete mode 100644 widget/isactivefeed/isactivefeed_widget.php create mode 100644 widget/kwhperiod/kwhperiod_render.js ------------------------------------------ Updating /var/www/emoncms/Modules/device module ------------------------------------------ Fetching origin From https://github.com/emoncms/device - [deleted] (none) -> origin/device-integration - [deleted] (none) -> origin/remove_user_dependency bc068f1..d5b0a56 master -> origin/master * [new branch] stable -> origin/stable * [new tag] 2.0.4 -> 2.0.4 * [new tag] 1.2.1 -> 1.2.1 * [new tag] 2.0.0 -> 2.0.0 - git branch: master - git tags: 1.1.1-18-gbc068f1 - no local changes - running: git pull origin master Branch master set up to track remote branch master from origin. Updating bc068f1..d5b0a56 Fast-forward .travis.yml | 13 + Views/device_dialog.css | 16 +- Views/device_dialog.js | 9 +- Views/device_dialog.php | 2 +- Views/device_view.php | 16 +- composer.json | 15 + .../circuitsetup-split-phase_solar.json | 318 +++++++++++++++++++++ data/CircuitSetup/circuitsetup_split-phase.json | 192 +++++++++++++ device_controller.php | 25 +- device_menu.php | 19 +- device_model.php | 76 +++-- device_template.php | 18 +- module.json | 2 +- 13 files changed, 639 insertions(+), 82 deletions(-) create mode 100644 .travis.yml create mode 100644 composer.json create mode 100644 data/CircuitSetup/circuitsetup-split-phase_solar.json create mode 100644 data/CircuitSetup/circuitsetup_split-phase.json ------------------------------------------ Updating /var/www/emoncms/Modules/graph module ------------------------------------------ Fetching origin From https://github.com/emoncms/graph 143976a..7df046d stable -> origin/stable 09a8c63..10b6855 emoncmsorg -> origin/emoncmsorg a205709..5cf8080 master -> origin/master * [new tag] 1.2.2 -> 1.2.2 * [new tag] 1.2.3 -> 1.2.3 * [new tag] 2.0.0 -> 2.0.0 * [new tag] 2.0.1 -> 2.0.1 * [new tag] 2.0.8 -> 2.0.8 - git branch: stable - git tags: 1.2.1-4-g143976a - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating 143976a..7df046d Fast-forward .gitmodules | 3 + Lib/date.js | 893 +++++++ Lib/timezone-js | 1 + Lib/tz/CONTRIBUTING | 92 + Lib/tz/LICENSE | 5 + Lib/tz/Makefile | 1093 ++++++++ Lib/tz/NEWS | 4719 ++++++++++++++++++++++++++++++++++ Lib/tz/README | 50 + Lib/tz/africa | 1347 ++++++++++ Lib/tz/antarctica | 343 +++ Lib/tz/asia | 3600 ++++++++++++++++++++++++++ Lib/tz/australasia | 2046 +++++++++++++++ Lib/tz/backward | 130 + Lib/tz/backzone | 699 +++++ Lib/tz/calendars | 173 ++ Lib/tz/checklinks.awk | 48 + Lib/tz/checktab.awk | 186 ++ Lib/tz/etcetera | 80 + Lib/tz/europe | 3995 ++++++++++++++++++++++++++++ Lib/tz/factory | 12 + Lib/tz/iso3166.tab | 274 ++ Lib/tz/leap-seconds.list | 255 ++ Lib/tz/leapseconds | 69 + Lib/tz/leapseconds.awk | 108 + Lib/tz/northamerica | 3478 +++++++++++++++++++++++++ Lib/tz/pacificnew | 29 + Lib/tz/southamerica | 1966 ++++++++++++++ Lib/tz/systemv | 39 + Lib/tz/theory.html | 1352 ++++++++++ Lib/tz/version | 1 + Lib/tz/yearistype.sh | 39 + Lib/tz/ziguard.awk | 124 + Lib/tz/zishrink.awk | 320 +++ Lib/tz/zone.tab | 449 ++++ Lib/tz/zone1970.tab | 383 +++ Lib/tz/zoneinfo2tdf.pl | 53 + Views/sidebar.php | 37 + embed.php | 50 +- graph.css | 209 +- graph.js | 1179 ++++++--- graph_controller.php | 4 +- graph_menu.php | 15 +- graph_model.php | 8 +- group_view.php | 5 +- locale/cy_GB/LC_MESSAGES/messages.mo | Bin 0 -> 3466 bytes locale/cy_GB/LC_MESSAGES/messages.po | 345 +++ locale/fr_FR/LC_MESSAGES/messages.mo | Bin 0 -> 4671 bytes locale/fr_FR/LC_MESSAGES/messages.po | 412 +++ module.json | 2 +- readme.md | 2 +- view.php | 603 +++-- widget/graph_widget.php | 3 +- 52 files changed, 30682 insertions(+), 646 deletions(-) create mode 100644 .gitmodules create mode 100644 Lib/date.js create mode 160000 Lib/timezone-js create mode 100644 Lib/tz/CONTRIBUTING create mode 100644 Lib/tz/LICENSE create mode 100644 Lib/tz/Makefile create mode 100644 Lib/tz/NEWS create mode 100644 Lib/tz/README create mode 100644 Lib/tz/africa create mode 100644 Lib/tz/antarctica create mode 100644 Lib/tz/asia create mode 100644 Lib/tz/australasia create mode 100644 Lib/tz/backward create mode 100644 Lib/tz/backzone create mode 100644 Lib/tz/calendars create mode 100644 Lib/tz/checklinks.awk create mode 100644 Lib/tz/checktab.awk create mode 100644 Lib/tz/etcetera create mode 100644 Lib/tz/europe create mode 100644 Lib/tz/factory create mode 100644 Lib/tz/iso3166.tab create mode 100644 Lib/tz/leap-seconds.list create mode 100644 Lib/tz/leapseconds create mode 100644 Lib/tz/leapseconds.awk create mode 100644 Lib/tz/northamerica create mode 100644 Lib/tz/pacificnew create mode 100644 Lib/tz/southamerica create mode 100644 Lib/tz/systemv create mode 100644 Lib/tz/theory.html create mode 100644 Lib/tz/version create mode 100644 Lib/tz/yearistype.sh create mode 100644 Lib/tz/ziguard.awk create mode 100644 Lib/tz/zishrink.awk create mode 100644 Lib/tz/zone.tab create mode 100644 Lib/tz/zone1970.tab create mode 100755 Lib/tz/zoneinfo2tdf.pl create mode 100644 Views/sidebar.php create mode 100644 locale/cy_GB/LC_MESSAGES/messages.mo create mode 100644 locale/cy_GB/LC_MESSAGES/messages.po create mode 100644 locale/fr_FR/LC_MESSAGES/messages.mo create mode 100644 locale/fr_FR/LC_MESSAGES/messages.po ------------------------------------------ Updating /var/www/emoncms/Modules/wifi module ------------------------------------------ Fetching origin From https://github.com/emoncms/wifi - [deleted] (none) -> origin/wifi-country d843ef2..274bcd5 stable -> origin/stable cb78a15..c81609e 9.0 -> origin/9.0 05575c0..274bcd5 master -> origin/master * [new branch] save_with_tee -> origin/save_with_tee * [new tag] 2.0.0 -> 2.0.0 * [new tag] 1.3.1 -> 1.3.1 - git branch: stable - git tags: 1.2.0-29-gd843ef2 - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating d843ef2..274bcd5 Fast-forward .travis.yml | 13 +++ README.md | 11 +- composer.json | 15 +++ module.json | 2 +- view.html | 2 +- wifi.php | 286 ++++++++++++++++++++++++++++++---------------------- wifi_controller.php | 207 ++++++++++++++++++------------------- wifi_menu.php | 8 +- 8 files changed, 317 insertions(+), 227 deletions(-) create mode 100644 .travis.yml create mode 100644 composer.json ------------------------------------------ Updating postprocess module ------------------------------------------ Fetching origin From https://github.com/emoncms/postprocess d392f91..5c7b36e emonpi -> origin/emonpi 93c7cd7..0e2d78f master -> origin/master * [new branch] stable -> origin/stable * [new tag] 1.0.0 -> 1.0.0 * [new tag] 2.0.0 -> 2.0.0 * [new tag] 2.1.0 -> 2.1.0 - git branch: emonpi - git tags: 1.0.0 - no local changes - running: git pull origin emonpi Branch emonpi set up to track remote branch emonpi from origin. Updating d392f91..5c7b36e Fast-forward .travis.yml | 13 ++ common.php | 29 ++++ composer.json | 16 +++ postprocess-module/module.json | 2 +- postprocess-module/postprocess_controller.php | 196 +++++++++++++++++--------- postprocess-module/postprocess_menu.php | 11 +- postprocess-module/postprocess_model.php | 2 +- postprocess-module/view.js | 98 +++++++++++-- postprocess-module/view.php | 46 +++++- postprocess_run.php | 9 +- processes/basic_formula.php | 151 ++++++++++++++++++++ processes/constantflow_tokwh.php | 107 ++++++++++++++ processes/liquidorairflow_tokwh.php | 118 ++++++++++++++++ processes/powertokwh.php | 38 +++-- processes/trimfeedstart.php | 3 +- 15 files changed, 737 insertions(+), 102 deletions(-) create mode 100644 .travis.yml create mode 100644 composer.json create mode 100644 processes/basic_formula.php create mode 100644 processes/constantflow_tokwh.php create mode 100644 processes/liquidorairflow_tokwh.php ------------------------------------------ Updating sync module ------------------------------------------ Fetching origin From https://github.com/emoncms/sync 67a12d6..1a1d590 master -> origin/master * [new branch] stable -> origin/stable * [new tag] 1.0.1 -> 1.0.1 * [new tag] 2.0.3 -> 2.0.3 * [new tag] 2.0.0 -> 2.0.0 * [new tag] 2.0.1 -> 2.0.1 - git branch: master - git tags: 1.0.1 - no local changes - running: git pull origin master Branch master set up to track remote branch master from origin. Updating 67a12d6..1a1d590 Fast-forward .travis.yml | 13 ++ composer.json | 15 ++ readme.md | 24 +--- sync-module/Module.json | 2 +- sync-module/sidebar.js | 56 -------- sync-module/style.css | 69 --------- sync-module/sync_controller.php | 37 ++--- sync-module/sync_menu.php | 36 ++--- sync-module/sync_model.php | 2 +- sync-module/sync_view.php | 311 ++++++++++++++++++++-------------------- sync_run.php | 29 ++-- 11 files changed, 242 insertions(+), 352 deletions(-) create mode 100644 .travis.yml create mode 100644 composer.json delete mode 100644 sync-module/sidebar.js delete mode 100644 sync-module/style.css ------------------------------------------ Updating backup module ------------------------------------------ Fetching origin From https://github.com/emoncms/backup 0aa1a3b..01a4ad4 stable -> origin/stable e811075..d474916 master -> origin/master * [new tag] 1.1.6 -> 1.1.6 * [new tag] 2.2.1 -> 2.2.1 * [new tag] 1.2.0 -> 1.2.0 * [new tag] 2.0.0 -> 2.0.0 - git branch: stable - git tags: 1.1.5-4-g0aa1a3b - no local changes - running: git pull origin stable Branch stable set up to track remote branch stable from origin. Updating 0aa1a3b..01a4ad4 Fast-forward .gitignore | 1 + {backup => backup-module}/backup_controller.php | 51 ++++-- backup-module/backup_menu.php | 32 ++++ backup-module/backup_view.php | 226 ++++++++++++++++++++++++ {backup => backup-module}/module.json | 2 +- backup/backup_menu.php | 5 - backup/backup_view.php | 134 -------------- config.cfg | 24 --- default.config.cfg | 34 ++-- emoncms-copy.sh | 91 ++++++++++ emoncms-export.sh | 98 +++++++--- emoncms-import.sh | 111 +++++++----- emonpi.default.config.cfg | 27 --- get_emoncms_feed_datadir.php | 6 +- get_emoncms_mysql_auth.php | 2 +- install.sh | 98 ++++++++++ readme.md | 104 +++-------- service-runner | 29 --- usb-import.sh | 197 +++++++++++++++++++++ 19 files changed, 870 insertions(+), 402 deletions(-) create mode 100644 .gitignore rename {backup => backup-module}/backup_controller.php (55%) create mode 100644 backup-module/backup_menu.php create mode 100644 backup-module/backup_view.php rename {backup => backup-module}/module.json (54%) delete mode 100644 backup/backup_menu.php delete mode 100644 backup/backup_view.php delete mode 100755 config.cfg create mode 100755 emoncms-copy.sh delete mode 100644 emonpi.default.config.cfg create mode 100755 install.sh delete mode 100755 service-runner create mode 100755 usb-import.sh switching postprocess module to stable branch Switched to a new branch 'stable' Branch stable set up to track remote branch stable from origin. switching device module to stable branch Switched to a new branch 'stable' Branch stable set up to track remote branch stable from origin. switching sync module to stable branch Switched to a new branch 'stable' Branch stable set up to track remote branch stable from origin. ------------------------------------------ Auto Installation of Emoncms Modules ------------------------------------------ - graph module already installed - device module already installed - postprocess module already installed - sync module already installed - backup module already installed /home/pi/emonpi/sudoers.d/emoncms-rebootbutton: parsed OK emoncms-rebootbutton sudoers entry installed /home/pi/emonpi/sudoers.d/emoncms-filesystem: parsed OK emoncms-filesystem sudoers entry installed /home/pi/emonpi/sudoers.d/wifi-sudoers: parsed OK wifi-sudoers sudoers entry installed www-data : www-data video systemd-journal ------------------------------------------ SERVICES ------------------------------------------ Removing mqtt_input.service from /etc/systemd/system Installing emoncms_mqtt.service in /lib/systemd/system (creating symlink) Created symlink /etc/systemd/system/multi-user.target.wants/emoncms_mqtt.service → /var/www/emoncms/scripts/services/emoncms_mqtt/emoncms_mqtt.service. Created symlink /etc/systemd/system/emoncms_mqtt.service → /var/www/emoncms/scripts/services/emoncms_mqtt/emoncms_mqtt.service. removing initd feedwriter service Log is turned off Stopping feedwriter: stopped Installing feedwriter.service in /lib/systemd/system (creating symlink) Created symlink /etc/systemd/system/multi-user.target.wants/feedwriter.service → /var/www/emoncms/scripts/services/feedwriter/feedwriter.service. Created symlink /etc/systemd/system/feedwriter.service → /var/www/emoncms/scripts/services/feedwriter/feedwriter.service. service-runner.service already installed ------------------------------------------ Installing mariadb service config [Service] ProtectHome=false Reloading systemctl deamon Update Emoncms database ["ALTER TABLE `dashboard` ADD `fullscreen` tinyint(1) DEFAULT '0'"] Restarting Services... - sudo systemctl restart feedwriter.service --- ActiveState=active --- - sudo systemctl restart emoncms_mqtt.service --- ActiveState=active --- - sudo systemctl restart emonhub.service --- ActiveState=active --- Symlinking emonpiupdate.log Installing emoncms logrotate... Now setting up Logrotate... Backing up old logrotate configuration... Linked to new logrotate configuration... Backing up old logrotate cron job... Linked to new logrotate cron job... Completed Completed Running logrotate... set log rotate config owner to root ------------------------------------------ Emoncms update script complete ------------------------------------------ Starting emonPi LCD service.. ------------------------------------------------------------- emonPi update done: Fri 21 Feb 17:03:10 UTC 2020 ------------------------------------------------------------- restarting service-runner service-runner: no process found