eduardofsr
(Eduardo Rodrigues)
1
Hi, I have a RPI3 with emoncms low-write v10 and some days ago run the update and something went wrong (don’t know what!)!
Now when I went to the input’s I get the error:
EmonCMS Error
Message: ReferenceError: processlist_ui is not defined
Route: Lib/tablejs/custom-table-fields.js
Line: 63
Column: 11
Anybody can help me please?
borpin
(Brian Orpin)
2
Hi, Did you install this using the EmonSD image?
If so can you run the update again and then post the update log plus the server information (click on copy markdown from the admin page and paste in a replay) please.
borpin
(Brian Orpin)
4
So this is the first problem, the update of the emonpi repo has failed because of a modified file. The update scripts have changed so that might be the issue.
You need clear this error. Are you familiar with git?
A point of note, you are still on a Jessie based image. Jessie will soon be unsupported so at some point you need to consider either moving to Stretch (the latest Sd Image) or moving to Buster once the EmonCMS install scripts come out of Alpha. Moving via the bacup/restore works pretty well, but lets get this version working first.
eduardofsr
(Eduardo Rodrigues)
5
I’m familiar with ssh, unix, etc… but not much with git.
borpin
(Brian Orpin)
6
Ok so SSH in and navigate to the emonpi folder at /home/pi/emonpi
Do you know if you modified the file rc.local_jessieminimal?
You can see differences between your local version and the remote version with
git diff rc.local_jessieminimal
If you did not make changes, it is safe just to reset the local repo back to the remote
sudo git reset --hard
If yes
git stash
git pull
git stash pop
This saves your file, pulls in the changes from the remote repo and then pops your changed file back on top.
If you can post the terminal output we can check it was successful.
eduardofsr
(Eduardo Rodrigues)
7
pi@emonpi(ro):emonpi$ git diff rc.local_jessieminimal
diff --git a/rc.local_jessieminimal b/rc.local_jessieminimal
index ece5695..8054c20 100755
--- a/rc.local_jessieminimal
+++ b/rc.local_jessieminimal
@@ -29,7 +29,7 @@ then
sudo systemctl restart systemd-random-seed.service
# Start / Restart services,they should run happy now log dir's are created
- sleep 3
+ sleep 10
service mysql restart
service redis-server restart
service mosquitto restart
Then I do:
sudo git reset --hard
Then reboot the rpi, run the update again:
LAST ENTRIES ON THE LOG FILE
Starting update via service-runner-update.sh (v2.0) >
Filesystem is unlocked - Write access
type ' rpi-ro ' to lock
- emonSD version: emonSD-26Oct17
emonSD base image check passed...continue update
git pull /home/pi/emonpi
* master
wifiap
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add ..." to include in what will be committed)
1
nothing added to commit but untracked files present (use "git add" to track)
Already up-to-date.
-------------------------------------------------------------
Main Update Script
-------------------------------------------------------------
Date: Tue 16 Jul 08:25:39 UTC 2019
EUID: 1000
usrdir: /home/pi
type: all
firmware: emonpi
Checking environment:
- pi user found
EUID: 1000
Hardware detected: rfm2pi
Stopping emonPiLCD service
Display update message on LCD
I2C LCD NOT DETECTED on either 0x['27', '3f'] ...exiting LCD script
-------------------------------------------------------------
Hit http://archive.raspberrypi.org jessie InRelease
Hit http://mirrordirector.raspbian.org jessie InRelease
Hit http://archive.raspberrypi.org jessie/main armhf Packages
Hit http://mirrordirector.raspbian.org jessie/main armhf Packages
Hit http://archive.raspberrypi.org jessie/ui armhf Packages
Hit http://mirrordirector.raspbian.org jessie/contrib armhf Packages
Hit http://mirrordirector.raspbian.org jessie/non-free armhf Packages
Hit http://mirrordirector.raspbian.org jessie/rpi armhf Packages
Ign http://archive.raspberrypi.org jessie/main Translation-en_GB
Ign http://archive.raspberrypi.org jessie/main Translation-en
Ign http://archive.raspberrypi.org jessie/ui Translation-en_GB
Ign http://archive.raspberrypi.org jessie/ui Translation-en
Ign http://mirrordirector.raspbian.org jessie/contrib Translation-en_GB
Ign http://mirrordirector.raspbian.org jessie/contrib Translation-en
Ign http://mirrordirector.raspbian.org jessie/main Translation-en_GB
Ign http://mirrordirector.raspbian.org jessie/main Translation-en
Ign http://mirrordirector.raspbian.org jessie/non-free Translation-en_GB
Ign http://mirrordirector.raspbian.org jessie/non-free Translation-en
Ign http://mirrordirector.raspbian.org jessie/rpi Translation-en_GB
Ign http://mirrordirector.raspbian.org jessie/rpi Translation-en
Hit http://ppa.launchpad.net xenial InRelease
Hit http://ppa.launchpad.net xenial/main Sources
Ign http://dl.bintray.com stable InRelease
Hit http://ppa.launchpad.net xenial/main armhf Packages
Get:1 http://dl.bintray.com stable Release.gpg [821 B]
Get:2 http://dl.bintray.com stable Release [6,051 B]
Hit http://ppa.launchpad.net xenial/main Translation-en
Get:3 http://dl.bintray.com stable/main armhf Packages [77.8 kB]
Ign http://dl.bintray.com stable/main Translation-en_GB
Ign http://dl.bintray.com stable/main Translation-en
Hit http://repo.mosquitto.org jessie InRelease
Hit http://repo.mosquitto.org jessie/main armhf Packages
Ign http://repo.mosquitto.org jessie/main Translation-en_GB
Ign http://repo.mosquitto.org jessie/main Translation-en
Fetched 84.6 kB in 7s (10.9 kB/s)
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
rng-tools is already the newest version.
python-gpiozero is already the newest version.
python-rpi.gpio is already the newest version.
0 upgraded, 0 newly installed, 0 to remove and 43 not upgraded.
Could not fetch URL https://pypi.python.org/simple/paho-mqtt/: There was a problem confirming the ssl certificate: ("bad handshake: SysCallError(104, 'ECONNRESET')",) - skipping
Requirement already up-to-date: paho-mqtt in /usr/local/lib/python2.7/dist-packages
You are using pip version 8.1.2, however version 19.1.1 is available.
You should consider upgrading via the 'pip install --upgrade pip' command.
-------------------------------------------------------------
git pull /home/pi/RFM2Pi
* master
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory 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 directory 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 directory clean
Already up-to-date.
git pull /home/pi/oem_openHab
* master
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)
modified: openhab.cfg
no changes added to commit (use "git add" and/or "git commit -a")
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 directory clean
Already up-to-date.
-------------------------------------------------------------
EmonPi Firmware Update
-------------------------------------------------------------
Start ATmega328 serial upload using avrdude with latest.hex
Discrete Sampling
avrdude -c arduino -p ATMEGA328P -P /dev/ttyAMA0 -b 115200 -U flash:w:/home/pi/emonpi/firmware/compiled/latest.hex
avrdude-original: Using autoreset DTR on GPIO Pin 7
avrdude-original: stk500_recv(): programmer is not responding
avrdude-original: stk500_getsync() attempt 1 of 10: not in sync: resp=0x00
avrdude-original: stk500_recv(): programmer is not responding
avrdude-original: stk500_getsync() attempt 2 of 10: not in sync: resp=0x00
avrdude-original: stk500_recv(): programmer is not responding
avrdude-original: stk500_getsync() attempt 3 of 10: not in sync: resp=0x00
avrdude-original: stk500_recv(): programmer is not responding
avrdude-original: stk500_getsync() attempt 4 of 10: not in sync: resp=0x00
avrdude-original: stk500_recv(): programmer is not responding
avrdude-original: stk500_getsync() attempt 5 of 10: not in sync: resp=0x00
avrdude-original: stk500_recv(): programmer is not responding
avrdude-original: stk500_getsync() attempt 6 of 10: not in sync: resp=0x00
avrdude-original: stk500_recv(): programmer is not responding
avrdude-original: stk500_getsync() attempt 7 of 10: not in sync: resp=0x00
avrdude-original: stk500_recv(): programmer is not responding
avrdude-original: stk500_getsync() attempt 8 of 10: not in sync: resp=0x00
avrdude-original: stk500_recv(): programmer is not responding
avrdude-original: stk500_getsync() attempt 9 of 10: not in sync: resp=0x00
avrdude-original: stk500_recv(): programmer is not responding
avrdude-original: stk500_getsync() attempt 10 of 10: not in sync: resp=0x00
avrdude-original done. Thank you.
strace: |autoreset: Broken pipe
Start emonhub update script:
-------------------------------------------------------------
emonHub update started
-------------------------------------------------------------
- usr directory: /home/pi
git pull /home/pi/emonhub
K0den-wibeee_interface
* emon-pi
hmm01i-syslogging
On branch emon-pi
Your branch is up-to-date with 'origin/emon-pi'.
nothing to commit, working directory clean
Already up-to-date.
Creating emonhub logfile
Symlinking emonhub.conf to /etc/emonhub/emonhub.conf
emonhub.service already installed
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
[[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: aa0f049cb8056050e1050c846574edb1
Default settings.php md5: 0e4803a641b7784ed23edf87506ce761
settings.php HAS been user modified
Checking status of /var/www/emoncms git repository
- git branch: stable
- no local changes
- running: git pull origin stable
From https://github.com/emoncms/emoncms
* branch stable -> FETCH_HEAD
Already up-to-date.
NEW default settings.php md5: 0e4803a641b7784ed23edf87506ce761
settings.php not updated
-------------------------------------------------------------
Updating Emoncms Modules
-------------------------------------------------------------
------------------------------------------
Updating /var/www/emoncms/Modules/app module
------------------------------------------
- git branch: stable
- git tags: 1.2.1-90-g6e5016a
- no local changes
- running: git pull origin stable
From https://github.com/emoncms/app
* branch stable -> FETCH_HEAD
Already up-to-date.
------------------------------------------
Updating /var/www/emoncms/Modules/config module
------------------------------------------
- git branch: stable
- git tags: 1.1.0-1-g5e96633
- no local changes
- running: git pull origin stable
error: insufficient permission for adding an object to repository database .git/objects
fatal: failed to write object
fatal: unpack-objects failed
------------------------------------------
Updating /var/www/emoncms/Modules/dashboard module
------------------------------------------
- git branch: stable
- git tags: 1.3.3-101-g337df80
- no local changes
- running: git pull origin stable
From https://github.com/emoncms/dashboard
* branch stable -> FETCH_HEAD
Already up-to-date.
------------------------------------------
Updating /var/www/emoncms/Modules/device module
------------------------------------------
- git branch: master
- git tags: 1.2.1-23-g7dd5c26
- no local changes
- running: git pull origin master
From https://github.com/emoncms/device
* branch master -> FETCH_HEAD
Already up-to-date.
------------------------------------------
Updating /var/www/emoncms/Modules/graph module
------------------------------------------
- git branch: stable
- git tags: 1.2.2-102-gc7f4ea9
- no local changes
- running: git pull origin stable
From https://github.com/emoncms/graph
* branch stable -> FETCH_HEAD
Already up-to-date.
------------------------------------------
Updating /var/www/emoncms/Modules/wifi module
------------------------------------------
- git branch: stable
- git tags: 1.3.1-8-gb67783d
- no local changes
- running: git pull origin stable
From https://github.com/emoncms/wifi
* branch stable -> FETCH_HEAD
Already up-to-date.
------------------------------------------
Updating postprocess module
------------------------------------------
- git branch: emonpi
- git tags: 2.1.0-3-g558173e
- no local changes
- running: git pull origin emonpi
Already up-to-date.
Already on 'emonpi'
Your branch is up-to-date with 'remotes/origin/emonpi'.
------------------------------------------
Updating sync module
------------------------------------------
- git branch: master
- git tags: 2.0.1-11-ge7dcf33
- no local changes
- running: git pull origin master
Already up-to-date.
Already on 'master'
Your branch is up-to-date with 'origin/master'.
------------------------------------------
Updating backup module
------------------------------------------
- git branch: stable
- git tags: 2.0.0-12-g67a1f1d
- no local changes
- running: git pull origin stable
Already up-to-date.
Already on 'stable'
Your branch is up-to-date with 'origin/stable'.
------------------------------------------
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
www-data : www-data video systemd-journal
------------------------------------------
SERVICES
------------------------------------------
emoncms_mqtt.service already installed
feedwriter.service already installed
service-runner.service already installed
------------------------------------------
Reloading systemctl deamon
Update Emoncms database
[]
Restarting Services...
- sudo systemctl restart feedwriter.service
--- ActiveState=active ---
- sudo systemctl restart emoncms_mqtt.service
--- ActiveState=active ---
- sudo systemctl restart emonhub.service
--- ActiveState=active ---
- sudo /etc/init.d/openhab restart
Restarting openhab (via systemctl): openhab.service.
● openhab.service - Starts and stops the openHAB Home Automation Bus
Loaded: loaded (/usr/lib/systemd/system/openhab.service; disabled)
Active: active (running) since Tue 2019-07-16 08:27:21 UTC; 77ms ago
Docs: http://www.openhab.org
Process: 7539 ExecStartPre=/usr/share/openhab/bin/setpermissions.sh (code=exited, status=0/SUCCESS)
Main PID: 7588 (openhab.sh)
CGroup: /system.slice/openhab.service
├─7588 /bin/sh /usr/share/openhab/bin/openhab.sh -o
└─7611 /usr/bin/java -Dlogback.configurationFile=/etc/openhab/logback.xml -Dosgi.clean=true -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Djetty.port=8080 -Dopenhab.configfile=/etc/openhab/configurations/openhab.cfg -Dopenhab.configdir=/etc/openhab/configurations -Dopenhab.logdir=/var/log/openhab -Dsmarthome.userdata=/var/lib/openhab -Djetty.home=/usr/share/openhab -Djetty.port.ssl=8443 -Djetty.config=/etc/openhab/jetty -Djetty.logs=/var/log/openhab -Djetty.rundir=/usr/share/openhab -Dfelix.fileinstall.dir=/usr/share/openhab/addons -Dfelix.fileinstall.filter=.*\.jar -Djava.library.path=/usr/share/openhab/lib -Djava.security.auth.login.config=/etc/openhab/login.conf -Dorg.quartz.properties=/etc/openhab/quartz.properties -Dequinox.ds.block_timeout=240000 -Dequinox.scr.waitTimeOnBlock=60000 -Dfelix.fileinstall.active.level=4 -Djava.awt.headless=true -jar /usr/share/openhab/server/plugins/org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar -configuration /var/lib/openhab/workspace -data /var/lib/openhab/workspace -console 5555
Jul 16 08:27:21 emonpi setpermissions.sh[7539]: setting owner openhab:openhab recursively for /var/lib/openhab
Jul 16 08:27:21 emonpi setpermissions.sh[7539]: setting permissions and owner openhab:openhab recursively for /var/log/openhab
Jul 16 08:27:21 emonpi setpermissions.sh[7539]: setting permissions and owner openhab:openhab recursively for /etc/openhab/configurations
Jul 16 08:27:21 emonpi setpermissions.sh[7539]: setting permissions and owner openhab:openhab for /usr/share/openhab/webapps/static
Jul 16 08:27:21 emonpi setpermissions.sh[7539]: setting permissions and owner openhab:openhab for /etc/openhab/jetty/etc/keystore
Jul 16 08:27:21 emonpi setpermissions.sh[7539]: setting permissions and owner openhab:openhab for /etc/openhab/configurations/users.cfg
Jul 16 08:27:21 emonpi systemd[1]: Started Starts and stops the openHAB Home Automation Bus.
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...
mv: cannot stat ‘/etc/cron.daily/logrotate’: No such file or directory
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..
Filesystem is locked - Read Only access
type ' rpi-rw ' to unlock
-------------------------------------------------------------
emonPi update done: Tue 16 Jul 08:27:28 UTC 2019
-------------------------------------------------------------
restarting service-runnerThe error still appears.
borpin
(Brian Orpin)
8
Have you cleared the browser cache?
If you open emoncms in a private window does the error occur?
borpin
(Brian Orpin)
10
Can you post a screenshot please?
[edit]
Could you also
- post the latest server information
- from the command line
git log -4 and post the output please.
eduardofsr
(Eduardo Rodrigues)
11
Server Information
Server Information
Services
-
emonhub :- Active Running
-
emoncms_mqtt :- Active Running
-
feedwriter :- Active Running - sleep 60s 104 feed points pending write
-
service-runner :- Active Running
-
emonPiLCD :- Active Exited
-
redis-server :- Active Running
-
mosquitto :- Active Running
Emoncms
-
Version :- low-write 10.1.2
-
Modules :- Administration | App v2.0.1 | Backup v2.1.0 | EmonHub Config v1.1.0 | Dashboard v2.0.3 | Device v2.0.0 | emailreport | EventProcesses | Feed | Graph v2.0.1 | Input | Postprocess v2.1.0 | CoreProcess | Schedule | Network Setup v1.0.0 | sync | Time | User | Visualisation | WiFi v2.0.0
-
Git :-
Server
-
OS :- Linux 4.19.36-v7+
-
Host :- emonpi | emonpi | (192.168.1.68)
-
Date :- 2019-07-16 16:33:10 UTC
-
Uptime :- 16:33:10 up 8:01, 1 user, load average: 0.12, 0.07, 0.08
Memory
-
RAM :- Used: 18.85%
-
Total :- 976.61 MB
-
Used :- 184.11 MB
-
Free :- 792.5 MB
Disk
-
/ :- Used: 80.05%
-
Total :- 3.33 GB
-
Used :- 2.67 GB
-
Free :- 515.29 MB
-
/boot :- Used: 38.54%
-
Total :- 59.95 MB
-
Used :- 23.1 MB
-
Free :- 36.84 MB
-
/home/pi/data :- Used: 6.74%
-
Total :- 10.94 GB
-
Used :- 754.85 MB
-
Free :- 9.64 GB
HTTP
-
Server :- Apache/2.4.10 (Raspbian) HTTP/1.1 CGI/1.1 80
MySQL
-
Version :- 5.5.62-0+deb8u1
-
Host :- localhost:6379 (127.0.0.1)
-
Date :- 2019-07-16 16:33:10 (UTC 00:00)
-
Stats :- Uptime: 28845 Threads: 3 Questions: 27933 Slow queries: 0 Opens: 63 Flush tables: 1 Open tables: 56 Queries per second avg: 0.968
Redis
-
Version :- 2.8.17
-
Host :- localhost:6379
-
Size :- 215 keys (528.50K)
-
Uptime :- 0 days
MQTT Server
-
Version :- Mosquitto 1.6.2
-
Host :- localhost:1883 (127.0.0.1)
PHP
-
Version :- 5.6.40-0+deb8u2 (Zend Version 2.6.0)
-
Modules :- apache2handler | bcmath | bz2 | calendar | Core v5.6.40-0+deb8u2 | ctype | curl | date v5.6.40-0+deb8u2 | dba | dio v0.0.4RC4 | dom v20031129 | ereg | exif v1.4 $Id: cad29b729548e4206f0697710cc9e177f26fdff3 $ | fileinfo v1.0.5 | filter v0.11.0 | ftp | gettext | hash v1.0 | iconv | json v1.3.6 | libxml | mbstring | mcrypt | mhash | mosquitto v0.4.0 | mysql v1.0 | mysqli v0.1 | openssl | pcre | PDO v1.0.4dev | pdo_mysql v1.0.2 | Phar v2.0.2 | posix | readline v5.6.40-0+deb8u2 | redis v2.2.7 | Reflection v$Id: 5f15287237d5f78d75b19c26915aa7bd83dee8b8 $ | session | shmop | SimpleXML v0.1 | soap | sockets | SPL v0.2 | standard v5.6.40-0+deb8u2 | sysvmsg | sysvsem | sysvshm | tokenizer v0.1 | wddx | xml | xmlreader v0.1 | xmlwriter v0.1 | Zend OPcache v7.0.6-devFE | zip v1.12.5 | zlib v2.0
Pi
-
Model :- Raspberry Pi 3 Model B+ Rev 1.3 - 1 GB (Sony UK)
-
SoC :- Broadcom BCM2835
-
Serial num. :- BF5B155
-
Temperature :- 55.31°C - 55.8°C
-
emonpiRelease :- emonSD-26Oct17
-
File-system :- read-only
pi@emonpi(ro):emonpi$ git log -4
commit 0a0c6ba551c2bde1742cf4b225a1637978802e40
Author: TrystanLea <glyn.hudson@openenergymonitor.org>
Date: Mon Jun 17 11:38:19 2019 +0100
use /usr/local/bin/emonhub
commit b8c057fbc559411f9f915fe5245ee1830be3eced
Author: TrystanLea <glyn.hudson@openenergymonitor.org>
Date: Wed Jun 12 11:15:19 2019 +0100
symlink emonpiupdate.log as part of update
auto create /var/log/emoncms on jessie
commit 1eaf658488b2268cca8b91a1309d065827d21c68
Author: trystanlea <trystan.lea@gmail.com>
Date: Tue Jun 11 13:29:14 2019 +0000
rc.local changes to symlink emonpiupdate.log
commit 693ebd7d48dff90077f38612f81c14ec1b2c994d
Author: TrystanLea <glyn.hudson@openenergymonitor.org>
Date: Tue Jun 4 17:21:18 2019 +0100
add emonhub.env settings file and install as part of update
pi@emonpi(ro):emonpi$
borpin
(Brian Orpin)
12
Ah sorry, my mistake,
cd /var/www/emoncms
git status
git describe
git log -4
eduardofsr
(Eduardo Rodrigues)
13
Output:
pi@emonpi(ro):emoncms$ git status
On branch stable
Your branch is ahead of 'origin/stable' by 2 commits.
(use "git push" to publish your local commits)
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: .htaccess
modified: Modules/admin/admin_controller.php
deleted: Modules/input/Views/input_view.js
modified: Modules/input/Views/input_view.php
modified: version.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
.htaccess_bak
Modules/input/Views/input_view.js_bak
Modules/input/Views/input_view.php_bak
no changes added to commit (use "git add" and/or "git commit -a")
pi@emonpi(ro):emoncms$ git describe
10.1.2-5-g1d0a70e
pi@emonpi(ro):emoncms$ git log -4
commit 1d0a70e0aea6da5e706fa9d97091284c679ce567
Merge: df9df3b a0c672e
Author: Eduardo <eduardofsr@hotmail.com>
Date: Tue Jul 9 10:27:28 2019 +0000
Merge branch 'stable' of https://github.com/emoncms/emoncms into stable
Conflicts:
Modules/admin/admin_controller.php
Modules/feed/Views/feedlist_view.php
Modules/input/Views/input_view.js
Modules/input/Views/input_view.php
version.txt
commit df9df3baca98cccf953e917a4ab26cb33de6f49a
Author: Eduardo <eduardofsr@hotmail.com>
Date: Tue Jul 9 10:25:35 2019 +0000
Commit
commit a0c672e4dbf7989d79b00758d5c7a0841e6dce8d
Merge: 76ced7c 74dc466
Author: TrystanLea <glyn.hudson@openenergymonitor.org>
Date: Sun Jun 30 10:06:49 2019 +0100
Merge remote-tracking branch 'origin/master' into stable
commit 74dc466151791013869db3e4290ea443b4eb4f45
Author: TrystanLea <glyn.hudson@openenergymonitor.org>
Date: Sun Jun 30 10:06:26 2019 +0100
version change
pi@emonpi(ro):emoncms$
borpin
(Brian Orpin)
14
Ok so it looks like you have modified some files so any update will not work.
Is this part of you trying to fix the issue?
I am surprise the .htaccess has been changed - is this deliberate?
I suggest resetting back to the remote repo unless you have a reason to keep these changes.
a
git reset --hard
git pull
should suffice (the untracked files will not impact anything)
[edit]
Sorry been searching for the right command…
If you want to see what is different between your local and the remote use
git diff @{upstream}
HTH
eduardofsr
(Eduardo Rodrigues)
15
Done this, now I have Internal Server Error
Found this in /var/log/apache2/error.log
/var/www/html/emoncms/.htaccess: /var/www/html/emoncms/.htaccess:211: <<<<<<<> was not closed.
borpin
(Brian Orpin)
16
Apologies, my mistake, I had forgotten the Jessie Image you are on is a Read-Only filesystem.
I should have noticed pi@emonpi(ro) - the ro tells me it is in read-only mode.
To switch between the 2 use the rpi-rw and rpi-ro commands.
cd /var/www/emoncms/
rpi-rw
git reset --hard
git pull
rpi-ro
Then post the output of
git status
git describe
git log -4
eduardofsr
(Eduardo Rodrigues)
17
Output:
pi@emonpi(ro):emoncms$ git status
On branch stable
Your branch is ahead of 'origin/stable' by 2 commits.
(use "git push" to publish your local commits)
nothing to commit, working directory clean
pi@emonpi(ro):emoncms$ git describe
10.1.2-5-g1d0a70e
pi@emonpi(ro):emoncms$ git log -4
commit 1d0a70e0aea6da5e706fa9d97091284c679ce567
Merge: df9df3b a0c672e
Author: Eduardo <eduardofsr@hotmail.com>
Date: Tue Jul 9 10:27:28 2019 +0000
Merge branch 'stable' of https://github.com/emoncms/emoncms into stable
Conflicts:
Modules/admin/admin_controller.php
Modules/feed/Views/feedlist_view.php
Modules/input/Views/input_view.js
Modules/input/Views/input_view.php
version.txt
commit df9df3baca98cccf953e917a4ab26cb33de6f49a
Author: Eduardo <eduardofsr@hotmail.com>
Date: Tue Jul 9 10:25:35 2019 +0000
Commit
commit a0c672e4dbf7989d79b00758d5c7a0841e6dce8d
Merge: 76ced7c 74dc466
Author: TrystanLea <glyn.hudson@openenergymonitor.org>
Date: Sun Jun 30 10:06:49 2019 +0100
Merge remote-tracking branch 'origin/master' into stable
commit 74dc466151791013869db3e4290ea443b4eb4f45
Author: TrystanLea <glyn.hudson@openenergymonitor.org>
Date: Sun Jun 30 10:06:26 2019 +0100
version change
pi@emonpi(ro):emoncms$
Matt-LT
(MATT)
18
I had this and it was a browser cache issue for me. Hope that helps.
borpin
(Brian Orpin)
19
I’ve seen this before that the reset does not work. you will need to try this one;
cd /var/www/emoncms/
rpi-rw
sudo git reset --hard @{u}
sudo git pull -f
rpi-ro
Then post the output of
git status
git describe
git log -4
eduardofsr
(Eduardo Rodrigues)
20
pi@emonpi(ro):emoncms$ git status
On branch stable
Your branch is up-to-date with 'origin/stable'.
nothing to commit, working directory clean
pi@emonpi(ro):emoncms$ git describe
10.1.2-3-ga0c672e
pi@emonpi(ro):emoncms$ git log -4
commit a0c672e4dbf7989d79b00758d5c7a0841e6dce8d
Merge: 76ced7c 74dc466
Author: TrystanLea <glyn.hudson@openenergymonitor.org>
Date: Sun Jun 30 10:06:49 2019 +0100
Merge remote-tracking branch 'origin/master' into stable
commit 74dc466151791013869db3e4290ea443b4eb4f45
Author: TrystanLea <glyn.hudson@openenergymonitor.org>
Date: Sun Jun 30 10:06:26 2019 +0100
version change
commit 3094817ce978fe587260f3cf4d0453f16361a8e6
Merge: aec6231 6d3b59a
Author: Trystan Lea <trystan.lea@googlemail.com>
Date: Sat Jun 29 13:32:23 2019 +0100
Merge pull request #1337 from emoncms/input_view_device_compatibility
Input view device compatibility
commit 6d3b59a5b35757966c0a5689eddee6f4f33412ca
Author: TrystanLea <glyn.hudson@openenergymonitor.org>
Date: Sat Jun 29 13:28:51 2019 +0100
improve device creation section
