|
|
@@ -49,17 +49,15 @@ func (r *MQTTReporter) takePhotoAndUploadToImagServers() bool {
|
|
|
d := time.Since(s).Milliseconds()
|
|
|
baseapp.Logger.Infof("[%s] 拍照完成, 输出到本地文件: %s, 耗时: %d毫秒", MODULE_NAME, imgFile, d)
|
|
|
|
|
|
- r.uploadPhotoToImagServers(imgFile)
|
|
|
+ r.uploadPhotoToImagServers(imgFile, false)
|
|
|
|
|
|
return true
|
|
|
}
|
|
|
|
|
|
-func (r *MQTTReporter) uploadPhotoToImagServers(imgFile string) {
|
|
|
+func (r *MQTTReporter) uploadPhotoToImagServers(imgFile string, isBackfill /* 本次调用是否补录上传 */ bool) {
|
|
|
ftpclient.FileUploader.Lock()
|
|
|
defer ftpclient.FileUploader.Unlock()
|
|
|
|
|
|
- ftpclient.FileUpFolder = r.deviceID
|
|
|
-
|
|
|
needImagBackfill := false
|
|
|
|
|
|
for _, server := range r.config.GetImagServers() {
|
|
|
@@ -78,10 +76,20 @@ func (r *MQTTReporter) uploadPhotoToImagServers(imgFile string) {
|
|
|
|
|
|
s := time.Now()
|
|
|
|
|
|
- if _, err := ftpclient.UploadFileToFtp(r.ctx, imgFile,
|
|
|
- serverInfo.Host, serverInfo.User, serverInfo.Pass, ftpclient.DefaultUploadTimeout); err != nil {
|
|
|
+ switch serverInfo.Scheme {
|
|
|
+ case "ftp":
|
|
|
+ ftpclient.FileUpFolder = serverInfo.Path
|
|
|
+ _, err = ftpclient.UploadFileToFtp(r.ctx, imgFile,
|
|
|
+ serverInfo.Host, serverInfo.User, serverInfo.Pass, ftpclient.DefaultUploadTimeout)
|
|
|
+ default:
|
|
|
+ baseapp.Logger.Errorf("[%s] 上传照片文件 %s -> %s 失败: 不支持的协议 %s!!",
|
|
|
+ MODULE_NAME, imgFile, server.Name, serverInfo.Scheme)
|
|
|
+ continue
|
|
|
+ }
|
|
|
+
|
|
|
+ if err != nil {
|
|
|
baseapp.Logger.Errorf("[%s] 上传照片文件 %s -> %s 失败: %v!!", MODULE_NAME, imgFile, server.Name, err)
|
|
|
- if server.ImagBackfill { // 是否需要补录
|
|
|
+ if server.ImagBackfill && !isBackfill {
|
|
|
needImagBackfill = true
|
|
|
}
|
|
|
continue
|
|
|
@@ -91,11 +99,14 @@ func (r *MQTTReporter) uploadPhotoToImagServers(imgFile string) {
|
|
|
baseapp.Logger.Infof("[%s] 上传照片文件 %s -> %s 成功, 耗时: %dms", MODULE_NAME, imgFile, server.Name, d)
|
|
|
}
|
|
|
|
|
|
- if !needImagBackfill { // 无需补录, 删除本地
|
|
|
+ if !needImagBackfill { //////////////////////////////////////////////////////////////// 不需补录, 删除本地
|
|
|
os.Remove(imgFile)
|
|
|
- } else { /// 需要补录, 按协议规定, 重命名文件
|
|
|
+ } else if !strings.HasPrefix(filepath.Base(imgFile), "history-") { /////// 需要补录, 按协议规定, 重命名文件
|
|
|
newName := filepath.Join(baseapp.IMG_DIR, "history-"+filepath.Base(imgFile))
|
|
|
- os.Rename(imgFile, newName)
|
|
|
+ if err := os.Rename(imgFile, newName); err != nil {
|
|
|
+ baseapp.Logger.Errorf("[%s] 照片文件重命名失败, 无法标记补录: %s -> %s, 错误: %v!!",
|
|
|
+ MODULE_NAME, imgFile, newName, err)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|