Rebased updating OctoFarm + Spectacular log dump #421

davidzwa · 2021-04-08T11:55:36Z

OctoFarm internal update command.

NotExpectedYet · 2021-04-10T10:29:40Z

@davidzwa Pushed what's done, will smash some more in the morning and hopefully get it finished.

server_src/utils/zip.utils.js

server_src/routes/settings.js

davidzwa · 2021-04-10T17:25:29Z

I love how detailed your PR is so far, this will hit dev soon like this! Good code so far, really good work there as well. 🚀

NotExpectedYet · 2021-04-11T06:19:44Z

I love how detailed your PR is so far, this will hit dev soon like this! Good code so far, really good work there as well. rocket

Thanks man! Good to hear. I'll clean up the history one the same like this as well.

NotExpectedYet · 2021-04-11T10:44:16Z

@davidzwa All done, just the tests and function comments to go through and update with a cup of tea.

Need food :P

Attached example files that are generated and outputted.

octofarm_dump.zip

OctoFarm System Information

OctoFarm Version

1.1.13-prerelease

Are we connected to the internet?

✓ ✓ ✓ We are! ✓ ✓ ✓

Are we running with node?

✓ ✓ ✓ We are! ✓ ✓ ✓

Are we running under pm2?

✘ ✘ ✘ We are not! ✘ ✘ ✘

Are we running under nodemon?

✓ ✓ ✓ We are! ✓ ✓ ✓

Are we in a docker container?

✘ ✘ ✘ We are not! ✘ ✘ ✘

Platform

linux

Processor Arch

x64

System Uptime

4h, 54m, 10s

OctoFarm Uptime

3m, 14s

OctoPrint Versions

1.5.3

davidzwa · 2021-04-11T20:13:03Z

@NotExpectedYet I cannot read the info above effectively. Please consider a compact and truly boring output format to save our eyes. Also, we'd be able to extend it later with much more detailed reporting (compactness > cool and artsy-fartsy style)

-- OctoFarm System Information -- 
OctoFarm Version:  
  1.1.13-prerelease 
Internet connection:  
  ✓
Running with NodeJS:  
  ✓

-- OctoFarm Service -- 
Either running under pm2:  
  ✘
Or running under nodemon:  
  ✓
Or running within a docker container  
  ✘

-- System --
Platform:  
  linux
Processor Arch:  
  x64
System Uptime:  
  4h, 54m, 10s 
OctoFarm Uptime:  
  3m, 14s
OctoPrint Versions:  
  1.5.3

Some points of attention:

Restart button is available when we know we are under nodemon/docker and it will thus fail.
pm2 command is fired off when under nodemon (or docker), and I expect docker as well. I have pm2 on my system, and this is crashing when I run under nodemon (and I guess docker). I'd prefer if pm2 is not fired off at all, as we already know it with isPm2(...) and the alternative checks.
error output in logs, when not under pm2, results in empty line as shown below. Also stdout is used to check for error. stdout gives me '\n' which isNaN(parseInt(...)) doesnt make a lot of sense (although it might work). I'd just check for stdout === 0, if that makes sense. Not sure what stdout is supposed to give, but I thought it was text like what pm2 pid OctoFarm results in (which is not a code right? Correct me if Im wrong.)

(Error output on console)
force check github is not really forced at all: the button sends a confusing message to the user: like they are doing something which requires care. I'd change it to Check for update. The user doesnt need to know where it came from (releases or repo). We will change this later without the user knowing, They need not know where it came from, unless you have something else in mind here.
Force check results in yellow Noty, like a warning. I'd prefer green and the message body being something like

"OctoFarm is already up to date, you're all set!"

we can check git changes with git status before git pull, we can advise the user before they are left alone to their own resolve. Please run "git reset --hard"! Or click here to save your config db js to .env! Like parse the git status output and provide tips to the user to check what changes to cancel out. (I can help out there on this PR, or we'd need to agree to do it directly in a follow-up PR).

This PR is hot!

NotExpectedYet · 2021-04-17T05:21:48Z

On it this morning

NotExpectedYet · 2021-04-17T05:54:06Z

@NotExpectedYet I cannot read the info above effectively. Please consider a compact and truly boring output format to save our eyes. Also, we'd be able to extend it later with much more detailed reporting (compactness > cool and artsy-fartsy style)

-- OctoFarm System Information -- 
OctoFarm Version:  
  1.1.13-prerelease 
Internet connection:  
  ✓
Running with NodeJS:  
  ✓

-- OctoFarm Service -- 
Either running under pm2:  
  ✘
Or running under nodemon:  
  ✓
Or running within a docker container  
  ✘

-- System --
Platform:  
  linux
Processor Arch:  
  x64
System Uptime:  
  4h, 54m, 10s 
OctoFarm Uptime:  
  3m, 14s
OctoPrint Versions:  
  1.5.3

Some points of attention:

* Restart button is available when we know we are under nodemon/docker and it will thus fail.

* pm2 command is fired off when under nodemon (or docker), and I expect docker as well. I have pm2 on my system, and this is crashing when I run under nodemon (and I guess docker). I'd prefer if pm2 is not fired off at all, as we already know it with `isPm2(...)` and the alternative checks.

* error output in logs, when not under pm2, results in empty line as shown below. Also stdout is used to check for error. `stdout` gives me '\n' which `isNaN(parseInt(...))` doesnt make a lot of sense (although it might work). I'd just check for `stdout === 0`, if that makes sense. Not sure what stdout is supposed to give, but I thought it was text like what `pm2 pid OctoFarm` results in (which is not a code right? Correct me if Im wrong.)
  ![image](https://user-images.githubusercontent.com/6005355/114319184-9ebe8480-9b10-11eb-8cff-b7afe4921410.png)
  (Error output on console)

* force check github is not really forced at all: the button sends a confusing message to the user: like they are doing something which requires care. I'd change it to `Check for update`. The user doesnt need to know where it came from (releases or repo). We will change this later without the user knowing, They need not know where it came from, unless you have something else in mind here.

* Force check results in yellow Noty, like a warning. I'd prefer green and the message body being something like

"OctoFarm is already up to date, you're all set!"

* we can check git changes with `git status` before `git pull`, we can advise the user before they are left alone to their own resolve. Please run "git reset --hard"! Or click here to save your config db js to `.env`! Like parse the `git status` output and provide tips to the user to check what changes to cancel out. (I can help out there on this PR, or we'd need to agree to do it directly in a follow-up PR).

This PR is hot!

Regarding the PID check, that was there before you'd made the pm2 function. All it's doing is checking for the output of a of a PID number. No number and it returns the error, but yeah your right in that it could be cleaner. I'll move it over to the pm2 check command then there's no need for it.

NotExpectedYet · 2021-04-17T06:32:54Z

--- OctoFarm System Information ---

OctoFarm Version
 1.1.13-prerelease 
Are we connected to the internet?
  ✓  
Are we running with node?
  ✓  
Are we running under pm2?
  ✘ 
Are we running under nodemon?
  ✓  
Are we in a docker container?
  ✘ 
Platform
 linux 
Processor Arch
 x64 
System Uptime
 2d, 2h, 42m, 18s 
OctoFarm Uptime
  26s 
OctoPrint Versions
  1.5.3

davidzwa · 2021-04-17T09:09:09Z

Why are the checks not firing I wonder, are the workflows changed?

NotExpectedYet · 2021-04-17T10:22:14Z

Didn't even notice, sure they fired when I pushed it earlier.

davidzwa · 2021-04-17T12:54:05Z

If you could, ##386 fits nicely in this PR

NotExpectedYet · 2021-04-17T16:20:53Z

Yeah no worries will sort it in the morning.

NotExpectedYet · 2021-04-18T05:20:32Z

Was because of the merge, all firing now.

CHANGELOG.md

davidzwa · 2021-04-18T11:53:54Z

server_src/lib/serverCommands.js

+      checkForNamedService = true;
+    }
+    if (isNodemon()) {
+      exec("touch ./app.js").catch((stderr) => {


Smart man! See what u did there.

…it" grab

server_src/config/users.js

…/OctoFarm into feature/update-octofarm

NotExpectedYet

After much pain and strife!

* Squash and rebase work on updater * Autoformat and fix disabled not bool bug * Fix forcecheck not a function * Fix * fix up to date catch * Moved up-to-date as last check and added "Changes not stages for commit" grab * If cancel update button disabled = false * update changelog * update changelog * Gulpy fish * remove git exec catches for stderr * message fix, and send the correct boolean you lord of the toilet rolls * Fix syntax error * False * Fake commit for testing pull * removal of the unneeded checkeroo * Fake commit again * And again * removal of the unneeded checkeroo * server reponse * Fake commit * Fix my wild goose chase bloody toilet roll failed me! * Fake commit * fix for git reset changes Co-authored-by: NotExpectedYet <online@notexpectedyet.com> Co-authored-by: James Mackay <info@notexpectedyet.com>

davidzwa added the effort-10 label Apr 8, 2021

davidzwa assigned davidzwa and NotExpectedYet Apr 8, 2021

davidzwa added this to Awaiting Review in 1.1.13 - Pushup Party Apr 8, 2021

davidzwa force-pushed the feature/update-octofarm branch 2 times, most recently from 83ca59b to 06c1de6 Compare April 9, 2021 14:39

davidzwa commented Apr 10, 2021

View reviewed changes

server_src/utils/zip.utils.js Outdated Show resolved Hide resolved

davidzwa commented Apr 10, 2021

View reviewed changes

server_src/utils/zip.utils.js Outdated Show resolved Hide resolved

davidzwa commented Apr 10, 2021

View reviewed changes

server_src/routes/settings.js Outdated Show resolved Hide resolved

davidzwa changed the title ~~Rebased and squashed changes on updating OctoFarm~~ Rebased updating OctoFarm Apr 11, 2021

NotExpectedYet changed the title ~~Rebased updating OctoFarm~~ Rebased updating OctoFarm + Spectacular log dump Apr 11, 2021

davidzwa commented Apr 18, 2021

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Squash and rebase work on updater

f3c4c6c

davidzwa force-pushed the feature/update-octofarm branch from c344d8e to f3c4c6c Compare April 18, 2021 11:49

davidzwa commented Apr 18, 2021

View reviewed changes

David Zwart added 2 commits April 18, 2021 14:08

Autoformat and fix disabled not bool bug

33d39e5

Fix forcecheck not a function

6c7eeba

David Zwart and others added 4 commits April 18, 2021 14:20

Fix

76b4758

fix up to date catch

7be4355

Moved up-to-date as last check and added "Changes not stages for comm…

cd83d4a

…it" grab

If cancel update button disabled = false

742a2ba

davidzwa commented Apr 18, 2021

View reviewed changes

server_src/config/users.js Show resolved Hide resolved

NotExpectedYet and others added 18 commits April 18, 2021 14:10

update changelog

14c2113

update changelog

9308936

Gulpy fish

70e13c0

remove git exec catches for stderr

4049c8e

Merge branch 'feature/update-octofarm' of https://github.com/OctoFarm…

3441b75

…/OctoFarm into feature/update-octofarm

message fix, and send the correct boolean you lord of the toilet rolls

0897333

Fix syntax error

2384cf4

False

8757882

Fake commit for testing pull

95839cf

removal of the unneeded checkeroo

51c7b58

Fake commit again

259d3dd

And again

9c0166f

removal of the unneeded checkeroo

ea7bf92

server reponse

9cd62d3

Fake commit

50b6558

Fix my wild goose chase bloody toilet roll failed me!

a2beadc

Fake commit

7d8ef1c

fix for git reset changes

d4b0db9

NotExpectedYet approved these changes Apr 18, 2021

View reviewed changes

NotExpectedYet merged commit ff018ad into development Apr 18, 2021

1.1.13 - Pushup Party automation moved this from Awaiting Review to Done Apr 18, 2021

NotExpectedYet deleted the feature/update-octofarm branch April 18, 2021 14:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebased updating OctoFarm + Spectacular log dump #421

Rebased updating OctoFarm + Spectacular log dump #421

davidzwa commented Apr 8, 2021 •

edited by NotExpectedYet

NotExpectedYet commented Apr 10, 2021

davidzwa commented Apr 10, 2021 •

edited

NotExpectedYet commented Apr 11, 2021

NotExpectedYet commented Apr 11, 2021 •

edited

davidzwa commented Apr 11, 2021 •

edited

NotExpectedYet commented Apr 17, 2021

NotExpectedYet commented Apr 17, 2021

NotExpectedYet commented Apr 17, 2021

davidzwa commented Apr 17, 2021 •

edited

NotExpectedYet commented Apr 17, 2021

davidzwa commented Apr 17, 2021

NotExpectedYet commented Apr 17, 2021

NotExpectedYet commented Apr 18, 2021

davidzwa Apr 18, 2021

NotExpectedYet Apr 18, 2021

NotExpectedYet left a comment

Rebased updating OctoFarm + Spectacular log dump #421

Rebased updating OctoFarm + Spectacular log dump #421

Conversation

davidzwa commented Apr 8, 2021 • edited by NotExpectedYet

NotExpectedYet commented Apr 10, 2021

davidzwa commented Apr 10, 2021 • edited

NotExpectedYet commented Apr 11, 2021

NotExpectedYet commented Apr 11, 2021 • edited

OctoFarm System Information

OctoFarm Version

Are we connected to the internet?

Are we running with node?

Are we running under pm2?

Are we running under nodemon?

Are we in a docker container?

Platform

Processor Arch

System Uptime

OctoFarm Uptime

OctoPrint Versions

davidzwa commented Apr 11, 2021 • edited

NotExpectedYet commented Apr 17, 2021

NotExpectedYet commented Apr 17, 2021

NotExpectedYet commented Apr 17, 2021

davidzwa commented Apr 17, 2021 • edited

NotExpectedYet commented Apr 17, 2021

davidzwa commented Apr 17, 2021

NotExpectedYet commented Apr 17, 2021

NotExpectedYet commented Apr 18, 2021

davidzwa Apr 18, 2021

Choose a reason for hiding this comment

NotExpectedYet Apr 18, 2021

Choose a reason for hiding this comment

NotExpectedYet left a comment

Choose a reason for hiding this comment

davidzwa commented Apr 8, 2021 •

edited by NotExpectedYet

davidzwa commented Apr 10, 2021 •

edited

NotExpectedYet commented Apr 11, 2021 •

edited

davidzwa commented Apr 11, 2021 •

edited

davidzwa commented Apr 17, 2021 •

edited