Merge pull request #759 from vania-pooh/master

Video and log listing fix
aerokube · Jul 2, 2019 · a30263c · a30263c
2 parents 31ca7e9 + c7ee6cb
commit a30263c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/main.go b/main.go
@@ -275,11 +275,11 @@ func video(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	user, remote := util.RequestInfo(r)
-	log.Printf("[%d] [LOG_LISTING] [%s] [%s]", requestId, user, remote)
 	if _, ok := r.URL.Query()[jsonParam]; ok {
 		listFilesAsJson(requestId, w, videoOutputDir, "VIDEO_ERROR")
 		return
 	}
+	log.Printf("[%d] [VIDEO_LISTING] [%s] [%s]", requestId, user, remote)
 	fileServer := http.StripPrefix(paths.Video, http.FileServer(http.Dir(videoOutputDir)))
 	fileServer.ServeHTTP(w, r)
 }

diff --git a/selenoid.go b/selenoid.go
@@ -594,11 +594,11 @@ func logs(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		user, remote := util.RequestInfo(r)
-		log.Printf("[%d] [LOG_LISTING] [%s] [%s]", requestId, user, remote)
 		if _, ok := r.URL.Query()[jsonParam]; ok {
 			listFilesAsJson(requestId, w, logOutputDir, "LOG_ERROR")
 			return
 		}
+		log.Printf("[%d] [LOG_LISTING] [%s] [%s]", requestId, user, remote)
 		fileServer := http.StripPrefix(paths.Logs, http.FileServer(http.Dir(logOutputDir)))
 		fileServer.ServeHTTP(w, r)
 		return