cmd/signaldctl/cmd/db/migrate.go

@@ -33,7 +33,6 @@ var (
 		{InstalledRank: 4, Version: "14", Description: "multiple identity keys per account", Script: "V14__multiple_identity_keys_per_account.sql", Checksum: -1635788950},
 		{InstalledRank: 5, Version: "15", Description: "profiles tables", Script: "V15__profiles_tables.sql", Checksum: 809686180},
 		{InstalledRank: 6, Version: "16", Description: "destination uuid in envelope", Script: "V16__destination_uuid_in_envelope.sql", Checksum: 357656854},
-		{InstalledRank: 7, Version: "17", Description: "update server ca", Script: "V17__update_server_ca.sql", Checksum: 1647934070},
 	}
 
 	sqlitePath  string

signald/signald.go

@@ -104,7 +104,7 @@ func (s *Signald) Close() error {
 }
 
 // Listen listens for events from signald
-func (s *Signald) Listen(c chan client_protocol.BasicResponse) error {
+func (s *Signald) Listen(c chan client_protocol.BasicResponse) {
 	for {
 		msg, err := s.readNext()
 		if err == io.EOF {
@@ -112,11 +112,7 @@ func (s *Signald) Listen(c chan client_protocol.BasicResponse) error {
 			if c != nil {
 				close(c)
 			}
-			return nil
-		}
-
-		if err != nil {
-			return err
+			return
 		}
 
 		if msg.Type == "unexpected_error" {
@@ -178,6 +174,9 @@ func (s *Signald) readNext() (b client_protocol.BasicResponse, err error) {
 	} else {
 		err = json.NewDecoder(s.socket).Decode(&b)
 	}
-
+	if err != nil {
+		log.Println("signald-go: error decoding message from signald:", err)
+		return
+	}
 	return
 }