Browse Source

Exception handling when adding a mount to the same device (#890)

link 2 years ago
parent
commit
1a2f917b30
1 changed files with 9 additions and 2 deletions
  1. 9 2
      route/v1/recover.go

+ 9 - 2
route/v1/recover.go

@@ -71,7 +71,10 @@ func GetRecoverStorage(c *gin.Context) {
 			}
 			}
 			if cf["type"] == "drive" && cf["username"] == dmap["username"] {
 			if cf["type"] == "drive" && cf["username"] == dmap["username"] {
 				c.String(200, `<p>The same configuration has been added</p><script>window.close()</script>`)
 				c.String(200, `<p>The same configuration has been added</p><script>window.close()</script>`)
-				service.MyService.Storage().CheckAndMountByName(cf["username"])
+				err := service.MyService.Storage().CheckAndMountByName(v)
+				if err != nil {
+					logger.Error("check and mount by name error: ", zap.Error(err), zap.Any("name", cf["username"]))
+				}
 				notify["status"] = "warn"
 				notify["status"] = "warn"
 				notify["message"] = "The same configuration has been added"
 				notify["message"] = "The same configuration has been added"
 				service.MyService.Notify().SendNotify("casaos:file:recover", notify)
 				service.MyService.Notify().SendNotify("casaos:file:recover", notify)
@@ -147,7 +150,11 @@ func GetRecoverStorage(c *gin.Context) {
 			}
 			}
 			if cf["type"] == "dropbox" && cf["username"] == dmap["username"] {
 			if cf["type"] == "dropbox" && cf["username"] == dmap["username"] {
 				c.String(200, `<p>The same configuration has been added</p><script>window.close()</script>`)
 				c.String(200, `<p>The same configuration has been added</p><script>window.close()</script>`)
-				service.MyService.Storage().CheckAndMountByName(cf["username"])
+				err := service.MyService.Storage().CheckAndMountByName(v)
+				if err != nil {
+					logger.Error("check and mount by name error: ", zap.Error(err), zap.Any("name", cf["username"]))
+				}
+
 				notify["status"] = "warn"
 				notify["status"] = "warn"
 				notify["message"] = "The same configuration has been added"
 				notify["message"] = "The same configuration has been added"
 				service.MyService.Notify().SendNotify("casaos:file:recover", notify)
 				service.MyService.Notify().SendNotify("casaos:file:recover", notify)