.

go/zodb/zodbtools/watch.go

-// Copyright (C) 2019  Nexedi SA and Contributors.
+// Copyright (C) 2019-2020  Nexedi SA and Contributors.
 //                          Kirill Smelkov <kirr@nexedi.com>
 //
 // This program is free software: you can Use, Study, Modify and Redistribute
@@ -152,21 +152,23 @@ func watchMain(argv []string) {
 	}
 	zurl := argv[0]
 
-	ctx := context.Background()
+	err := watchMain_(context.Background(), zurl, verbose)
+	if err != nil {
+		prog.Fatal(err)
+	}
+}
 
+func watchMain_(ctx context.Context, zurl string, verbose bool) (err error) {
 	stor, err := zodb.Open(ctx, zurl, &zodb.OpenOptions{ReadOnly: true})
 	if err != nil {
-		prog.Fatal(err)
+		return err
 	}
 	defer func() {
-		err := stor.Close()
-		if err != nil {
-			prog.Fatal(err)
+		err2 := stor.Close()
+		if err == nil {
+			err = err2
 		}
 	}()
 
-	err = Watch(ctx, stor, os.Stdout, verbose)
-	if err != nil {
-		prog.Fatal(err)
-	}
+	return Watch(ctx, stor, os.Stdout, verbose)
 }