Use fsnotify if using Directory and expose CompileTemplates #93
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
As a second step improving unrolled#90, only lock when absolutely necessary and reconstruct functions to ensure that the current templates are referenced in the helper func instead of a global reference. Closes unrolled#91 Signed-off-by: Andrew Thornton <art27@cantab.net>
If setting IsDevelopment, if we can, use an FsWatcher to recompile the templates in a separate goroutine. This should definitely increase the performance of the Development server. In order to make Asset based Renders have the same improvement - now that render compilation properly locks the templates we can expose the CompileTemplates function and allow downstream users to call this independently when their templates need recompilation. Contains unrolled#92 Signed-off-by: Andrew Thornton <art27@cantab.net>
unrolled
reviewed
May 16, 2021
| @@ -399,17 +432,19 @@ func (r *Render) Data(w io.Writer, status int, v []byte) error { | |||
| func (r *Render) HTML(w io.Writer, status int, name string, binding interface{}, htmlOpt ...HTMLOptions) error { | |||
|
|
|||
| // If we are in development mode, recompile the templates on every HTML request. | |||
| if r.opt.IsDevelopment { | |||
| r.compileTemplates() | |||
| r.lock.RLock() // rlock here because we're reading the hasWatcher | |||
There was a problem hiding this comment.
Do we need the lock to read r.hasWatcher? Looks like it's only set within the CompileTemplates func.
There was a problem hiding this comment.
@zeripath Looking again, the lock is probably a good idea since CompileTemplates is now exposed.
There was a problem hiding this comment.
Sorry I didn't get round to replying re: this - yes that was the reasoning.
|
My apologies for the delay on merging this! |
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.
If we have set
Options.IsDevelopment, if we can, use anfsnotify.Watcherto recompile the templates in a separate goroutine. This will significantly increase the performance of the Development server only recompiling if there is a change to the template files instead of recompiling on every request.This will work well for renderers using the directory format however, if
Options.AssetorOptions.AssetFileis set then this performance gain will not be possible. However, now thatcompileTemplatesproperly locks the templates we can make theCompileTemplatesfunction public and thus allow downstream users in that case the option to leaveIsDevelopmentfalse and instead recompile their templates, when and if, they detect a change within their assets.Contains #92
Signed-off-by: Andrew Thornton art27@cantab.net