Fix: serve front end from filesystem during development #164
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
jmorrell
approved these changes
Jan 29, 2025
Comment on lines
26
to
28
| type ServerEnv struct { | ||
| ServeFromFS bool | ||
| StaticDir string |
There was a problem hiding this comment.
Do we need both of these? What if we gated based on StaticDir != ""? Or we can derive both from one env var.
There was a problem hiding this comment.
Yeah we can, but I need to come up with a better name for it. Any ideas would be greatly appreciated.
There was a problem hiding this comment.
StaticDir works just fine for me. StaticAssetsDir if you want to be more specific? You can keep it in the ServerEnv struct.
Comment on lines
141
to
156
| func getServerEnv() ServerEnv { | ||
| serveFromFS, err := strconv.ParseBool(os.Getenv("SERVE_FROM_FS")) | ||
| if err != nil { | ||
| serveFromFS = false | ||
| } | ||
|
|
||
| staticDir := os.Getenv("STATIC_DIR") | ||
| if staticDir == "" { | ||
| serveFromFS = false | ||
| } | ||
|
|
||
| return ServerEnv{ | ||
| ServeFromFS: serveFromFS, | ||
| StaticDir: staticDir, | ||
| } | ||
| } |
There was a problem hiding this comment.
You could use os.LookupEnv instead and make this a little cleaner I think
if value, ok := os.LookupEnv(key); ok {
return value
}
return fallback
CtrlSpice
force-pushed
the
serve-from-fs
branch
from
50da567 to
bad2c6e
Compare
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.
SERVE_FROM_FSandSTATIC_DIRget passed in as envars, for real this timeenvis read when we instantiate the serverServer.HandlerandServer.IndexHandlernow use the server environment instead of reading envars or getting the data as an argument. I find it cleaner this way but I'm not overly attached to it.