adalal/gotenberg
1
0
Fork 0
mirror of https://github.com/gotenberg/gotenberg.git synced 2026-08-16 12:22:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(uno): close tcp connexions to the LibreOffice listener, better health check that take the restart into account

Browse Source
This commit is contained in:
Julien Neuhart
2022-02-08 16:12:41 +01:00
parent 5cad5ca11a
commit b7a8b95820
5 changed files with 229 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/modules/libreoffice/uno/uno.go
View File

@@ -179,10 +179,10 @@ func (mod UNO) Start() error {
// StartupMessage returns a custom startup message.
func (mod UNO) StartupMessage() string {
if mod.libreOfficeRestartThreshold == 0 {
return "Long-running LibreOffice listener disabled"
return "long-running LibreOffice listener disabled"
}
return "Long-running LibreOffice listener started"
return "long-running LibreOffice listener started"
}
// Stop stops the long-running LibreOffice Listener if it exists.
@@ -288,10 +288,6 @@ func (mod UNO) Checks() ([]health.CheckerOption, error) {
return errors.New("long-running LibreOffice listener unhealthy")
},
// The long-running LibreOffice listener may be restarting, so we
// wait a given amount of time until we consider the module
// unavailable.
MaxTimeInError: mod.libreOfficeStartTimeout,
}),
}, nil
}
@@ -339,6 +335,8 @@ func (mod UNO) PDF(ctx context.Context, logger *zap.Logger, inputPath, outputPat
err := mod.listener.unlock(logger)
if err != nil {
mod.logger.Error(fmt.Sprintf("unlock long-running LibreOffice listener: %v", err))
return
}
}()
}()