From 519244c01ff6a5cd3550fc44656b6eb741b99a8a Mon Sep 17 00:00:00 2001 From: Nick White Date: Fri, 22 May 2020 18:14:52 +0100 Subject: Fix bookpipeline failing if shutdown option isnt used --- cmd/bookpipeline/main.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cmd/bookpipeline') diff --git a/cmd/bookpipeline/main.go b/cmd/bookpipeline/main.go index 3b9befb..9618e93 100644 --- a/cmd/bookpipeline/main.go +++ b/cmd/bookpipeline/main.go @@ -727,9 +727,7 @@ func main() { if !*noanalyse { checkAnalyseQueue = time.After(0) } - if *autoshutdown { - shutdownIfQuiet = time.NewTimer(TimeBeforeShutdown) - } + shutdownIfQuiet = time.NewTimer(TimeBeforeShutdown) savelognow = time.NewTicker(LogSaveTime) for { -- cgit v1.2.1-24-ge1ad From ebc27eef77868fa44daed7cfb0ea129690029da8 Mon Sep 17 00:00:00 2001 From: Nick White Date: Tue, 26 May 2020 16:03:12 +0100 Subject: Add -c conntype for necessary tools to allow local connection to be used --- cmd/bookpipeline/main.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'cmd/bookpipeline') diff --git a/cmd/bookpipeline/main.go b/cmd/bookpipeline/main.go index 9618e93..344006a 100644 --- a/cmd/bookpipeline/main.go +++ b/cmd/bookpipeline/main.go @@ -25,7 +25,7 @@ import ( "rescribe.xyz/utils/pkg/hocr" ) -const usage = `Usage: bookpipeline [-v] [-np] [-nw] [-nop] [-na] [-t training] [-shutdown true/false] +const usage = `Usage: bookpipeline [-v] [-c conn] [-np] [-nw] [-nop] [-na] [-t training] [-shutdown true/false] Watches the preprocess, wipeonly, ocrpage and analyse queues for messages. When one is found this general process is followed: @@ -677,6 +677,7 @@ func main() { noocrpg := flag.Bool("nop", false, "disable ocr on individual pages") noanalyse := flag.Bool("na", false, "disable analysis") autoshutdown := flag.Bool("shutdown", false, "automatically shut down if no work has been available for 5 minutes") + conntype := flag.String("c", "aws", "connection type ('aws' or 'local')") flag.Usage = func() { fmt.Fprintf(flag.CommandLine.Output(), usage) @@ -697,7 +698,14 @@ func main() { ocredPattern := regexp.MustCompile(`.hocr$`) var conn Pipeliner - conn = &bookpipeline.AwsConn{Region: "eu-west-2", Logger: verboselog} + switch *conntype { + case "aws": + conn = &bookpipeline.AwsConn{Region: "eu-west-2", Logger: verboselog} + case "local": + conn = &bookpipeline.LocalConn{Logger: verboselog} + default: + log.Fatalln("Unknown connection type") + } conn.Log("Setting up AWS session") err := conn.Init() -- cgit v1.2.1-24-ge1ad