GitHubMirror/libmutton
1
0
Fork 0
mirror of https://github.com/rwinkhart/libmutton.git synced 2026-08-27 20:36:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add missing instances of cleanupOnFail() in synccycles.DeviceIDGen()

Browse Source
This commit is contained in:
RandyTheSilly
2025-12-10 00:13:40 -05:00
parent f16078fe01
commit 01be63c587
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
synccycles/init.go
+2
View File
@@ -67,6 +67,7 @@ func DeviceIDGen(oldDeviceID, prefix string) (string, string, string, error) {
return "", "", "", errors.New("unable to unmarshal server register response: " + err.Error()) return "", "", "", errors.New("unable to unmarshal server register response: " + err.Error())
} }
if registerResp.ErrMsg != nil { if registerResp.ErrMsg != nil {
cleanupOnFail()
return "", "", "", errors.New("unable to complete register; server-side error occurred: " + *registerResp.ErrMsg) return "", "", "", errors.New("unable to complete register; server-side error occurred: " + *registerResp.ErrMsg)
} }
_ = sshClient.Close() // ignore error; non-critical/unlikely/not much could be done about it _ = sshClient.Close() // ignore error; non-critical/unlikely/not much could be done about it
@@ -74,6 +75,7 @@ func DeviceIDGen(oldDeviceID, prefix string) (string, string, string, error) {
// remove old device ID file (locally; may not exist) // remove old device ID file (locally; may not exist)
err = os.RemoveAll(oldDeviceIDPath) err = os.RemoveAll(oldDeviceIDPath)
if err != nil { if err != nil {
cleanupOnFail()
return "", "", "", errors.New("unable to remove old device ID file (locally): " + err.Error()) return "", "", "", errors.New("unable to remove old device ID file (locally): " + err.Error())
} }