J87
25ae9b9a0d
Add example to "no editor" error
2021-11-21 12:10:24 +11:00
J87
6b10f2ab7d
Resolve function style
2021-11-21 12:07:30 +11:00
J87
375f591fe5
Remove outdated comments
2021-11-20 22:28:21 +11:00
J87
64c328c53d
Merge branch 'master' into user-editable-config
2021-11-20 16:37:49 +11:00
J87
e5994287fb
Remove outdated comments
2021-11-20 16:33:47 +11:00
jake87
7126014619
Added editing for instances
...
Instances require a number of modifications leading to it not being
able to be converted into a function. The main one is that there is a
list of config elements that cannot be set via the edit command and
either have to be set via different means or cannot be set. To stop
these fields constantly sending error messages, we disregard adding them
to the file in the first place.
2021-11-20 16:23:21 +11:00
Arvids Godjuks
3b8e89ea00
Merge pull request #424 from bbassie/slave-instance-ui-updates
...
Slave instance UI updates
2021-11-19 21:48:52 +02:00
jake87
31cfc45e58
Fix null processing ( again )
2021-11-17 21:16:22 +11:00
jake87
834fc8cf98
Fixed null value parsing
2021-11-17 18:16:24 +11:00
jake87
eb3b7df390
Fix to be more consistant with the rest of clustorio
...
Also made sure "null" is entered as empty as to be consistant with the
rest of clustorio.
2021-11-17 17:45:54 +11:00
jake87
76882ad1c4
Fix styling to be more consistant with the rest of clustorio
2021-11-17 17:42:39 +11:00
bbassie
15381ac260
Final running status color update
2021-11-16 23:50:13 +01:00
bbassie
b7e6acb24e
Added instance deleted alert and updated not found
2021-11-16 23:44:07 +01:00
bbassie
b86305db8c
Updated colors of the instance tag
2021-11-16 23:42:02 +01:00
bbassie
fe803a99ca
Instance status tag color changes
2021-11-16 21:50:21 +01:00
jake87
4612826664
spelling mistake
2021-11-16 21:43:59 +11:00
jake87
cc605250db
removed final debugging helpers
2021-11-14 20:55:16 +11:00
jake87
ae34a86cbf
Removed debugging prints, and added removing of tmpFile
2021-11-14 20:54:27 +11:00
jake87
86de5ae151
Fixed config editing, fixed child spawning, fixed config setting
...
Using an event emmiter, the fields can now be set correctly in the
master config. Null values are now handled correctly, and numbers are also set
correctly.
2021-11-14 20:51:06 +11:00
jake87
bcc25047f2
Readded config file editing, working on config file value setting
2021-11-13 22:35:15 +11:00
bbassie
f5ce0a8a8c
Missing import
2021-11-07 22:00:27 +01:00
bbassie
55bbc10986
Added slave status indicator tag to slave details page
...
Co-authored-by: Danielv123 <danielv@live.no >
2021-11-07 21:54:10 +01:00
bbassie
4fef2d8143
Fix message null issues
2021-11-07 21:35:48 +01:00
bbassie
4432a689bb
Fix instance list
2021-11-07 21:31:56 +01:00
jake87
6013fcd528
Started rework of file loading system
2021-11-06 17:04:34 +11:00
jake87
71fb8541d5
Added more comments, added quotes around strings
2021-11-06 14:32:13 +11:00
jake87
4398d33fea
Fixed definitions to be consistant with bullet points.
2021-11-05 23:32:18 +11:00
jake87
92814aa9b3
Reworked to use config list's grabber system
...
Also now using the system described by Hornwitser, in using
libConfig.MasterConfig.groups to get definitions. Now all that's needed
is to re-read the updated data back into clustorio.
2021-11-05 23:24:13 +11:00
bbassie
69d4a883ad
Add copy public address button
2021-11-04 22:25:53 +01:00
bbassie
2e5617c4b5
Fix instance port and status update
...
Master was not recieving instance status after restart. Instead only a status from the slave but the slave doesn't store the full instance status.
2021-11-04 22:25:36 +01:00
bbassie
f930ed36a0
Changed to using the real factorio port
2021-11-04 21:29:53 +01:00
bbassie
83b720eade
Added public_address field to lists
...
- InstanceList
- SlavesPage
Added public_address field to messages
- slaveProperties
- instanceProperties
2021-11-04 01:39:28 +01:00
bbassie
c3a1b420ea
Added InstanceStatusTag react component
...
- Modified InstanceList & InstanceViewPage to use it
2021-11-04 01:36:56 +01:00
Hornwitser
c889d8f325
Ignore SessionLost from updateInstances ( #422 )
...
Don't shutdown the slave if the connection session is lost during
updateInstances. Resolves #418 .
2021-11-03 16:27:21 +01:00
Hornwitser
e23d07e965
Use safe file writing pattern ( #421 )
...
Write new file contents to a temporary file and then rename over the
target file to avoid data loss in the unlikely event there's an error
writing the new file contents or the process is interrupted.
Resolves #416 .
2021-11-03 16:14:18 +01:00
jake87
08a8182173
Reworked to use throw error, added system for getting config groups
...
Now using `throw error` to exit out, instead of exit(1). Reworked config
get system to use the map of configs in libConfig.MasterConfig.groups .
2021-11-01 20:40:44 +11:00
Hornwitser
9e7a7a602f
Merge pull request #420 from Hornwitser/slave-page
...
Slave page
2021-10-31 16:53:34 +01:00
Hornwitser
6e5e5f0aeb
Show log console for master and slaves in web UI
...
Rename InstanceConsole to LogConsole and use it to show logs for the
master server and slaves as well.
2021-10-31 10:41:25 +01:00
Hornwitser
7769c1f89e
Add SlaveViewPage
...
Add slave overview page displaying instances assigned and some basic
properties.
2021-10-31 10:41:25 +01:00
Hornwitser
a2a5cf6d4c
Warn on instances with duplicated ids
...
It's possible that someone copies an instance folder and don't change
the instance id in it. Emit a warning in case this happens.
2021-10-31 07:26:56 +01:00
jake87
77e9b929dc
Testing why config not being returned correctly
2021-10-30 12:31:20 +11:00
jake87
b6306031dc
Reworked some of editor logic to work with async functions
...
Now async functions can be used after the editor returns, as before they
couldnt be used due to .on being non-async.
2021-10-29 22:21:46 +11:00
jake87
0564eee400
Experementing with the master config
...
no important work, commit for my own sake
2021-10-29 22:09:01 +11:00
jake87
f548ac2ecc
Added more logic into ctl.js
...
Now prints out a basic approximation of the final look of the config
file; with comments on the function of each part.
2021-10-29 20:42:32 +11:00
jake87
c9fd99589b
Added more selection options for the edit
...
ctl master config edit [editor]
is the new structure; it can take an optional editor, and will prio this
editor over any other editor, such as one set by env vars. Generally,
the prio goes like this: argv supplied editor > EDITOR env var > VISUAL
env var. Things needing to be done are marked with a TODO.
2021-10-27 20:16:37 +11:00
jake87
23d8a819af
Added basic framework for edit command
...
Implimented framework for edit command, including ability to get a temp
file, open an editor on the file, then resume code execution once the
editor exits.
2021-10-26 21:23:23 +11:00
jake87
14b3331c8e
Added basic logic for config edit command
...
Added groundwork for the ctl master config edit command,
including temporary file grabbing and JSON config fetching.
2021-10-26 20:46:24 +11:00
jake87
f266c441db
Fixed async logic within lib/file_ops.js
2021-10-26 20:46:24 +11:00
jake87
ed73e3ad1e
Fixed variable naming issue with file_ops.getTempFile
2021-10-26 20:46:05 +11:00
jake87
4f9a8fb45c
Rewrote temp function to be safer, using findUnusedName
2021-10-26 17:50:39 +11:00
J87