Lots of cleanup #11
Merged
Lots of cleanup #11
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I missed the port being hardcoded in the stat-pusher. This makes it properly go through the environment. The setup harness will auto-use 10004 if --pushStatusPort is set, otherwise set it to the specified value.
Instead of having the setup potentially copy over the example user file, just ask the user to set it up himself. This stops mistakes from happening with `--force`. Also mount the file into the container instead of copying it, so that an update just needs a container restart and not a rebuild. Hence, remove the rebuilding from the start script and add it as a developer-intended command to the npm scripts (since the only reason to rebuild would be if the pushStats scripts is edited).
This moves everything the setup step did to the `.env` & Compose files into the files themselves, which makes the Compose file fully static, with the `.env` file in charge of carrying the setup.
This just mounts the config files directly into the containers and passes the value we wanna tweak through the environment instead.
This saves Grafana from logging errors because the directories don't exist.
There's no .env file in that container, and everything is passed in by the compose file already.
User loading has been moved to its own file and validated for correctness; now, an user definition will be complete (there's a valid username, replaceName, host/port based on type, token/password), so that the rest of the code can just use those values. Now each time the cron triggers, the users file is parsed again, and users marked as type: "private" with nothing else will use a local Screeps server automatically if found; use an explicit host/port to make them static.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've toyed a bit more with it.
Changes are:
.envfile and the users.json file needing to be customized. If someone has special needs, all the configs for Grafana & Graphite are still there, they're just mounted directly into their respective containers (meaning apart from the.envfile, everything can be tracked and committed.