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

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

View File

@@ -258,14 +258,14 @@ func TestUNO_StartupMessage(t *testing.T) {
mod: UNO{
libreOfficeRestartThreshold: 10,
},
expectMessage: "Long-running LibreOffice listener started",
expectMessage: "long-running LibreOffice listener started",
},
{
name: "long-running LibreOffice listener disabled",
mod: UNO{
libreOfficeRestartThreshold: 0,
},
expectMessage: "Long-running LibreOffice listener disabled",
expectMessage: "long-running LibreOffice listener disabled",
},
}
@@ -755,7 +755,7 @@ func TestUNO_PDF(t *testing.T) {
},
logger: zap.NewNop(),
},
ctx: nil,
ctx: context.Background(),
logger: zap.NewNop(),
inputPath: "/tests/test/testdata/libreoffice/sample1.docx",
expectPDFErr: true,
@@ -824,6 +824,7 @@ func TestUNO_UNO(t *testing.T) {
type listenerMock struct {
startMock func(logger *zap.Logger) error
stopMock func(logger *zap.Logger) error
restartMock func(logger *zap.Logger) error
lockMock func(ctx context.Context, logger *zap.Logger) error
unlockMock func(logger *zap.Logger) error
portMock func() int
@@ -839,6 +840,10 @@ func (listener listenerMock) stop(logger *zap.Logger) error {
return listener.stopMock(logger)
}
func (listener listenerMock) restart(logger *zap.Logger) error {
return listener.restartMock(logger)
}
func (listener listenerMock) lock(ctx context.Context, logger *zap.Logger) error {
return listener.lockMock(ctx, logger)
}