fix: reqerr shows nothing on network layer error

boypt · Jul 21, 2021 · 1cc6068 · 1cc6068
1 parent 58f4516
commit 1cc6068
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/static/files/index.html b/static/files/index.html
@@ -78,7 +78,7 @@ <h2>
 			</div>
 			<div>
 				<span>Up {{ ago([[.Uptime]]*1000) }}</span>
-				<span ng-if="numKeys(state.Users) > 1">,{{ numKeys(state.Users) }} users connected</span>
+				<span ng-if="numKeys(state.Users) > 1">, {{ numKeys(state.Users) }} users connected</span>
 			</div>
 		</footer>
 		<div ng-if="$root.showEnineStatus" class="ui attached mini message">

diff --git a/static/files/js/utils.js b/static/files/js/utils.js
@@ -2,8 +2,11 @@
 
 app.factory("reqerr", function ($rootScope, $log) {
   return function (xhr) {
-    if ("data" in xhr) {
-      $rootScope.err = `${xhr.status} - ${xhr.statusText}`
+    $rootScope.err = `${xhr.xhrStatus}: ${xhr.statusText}/${xhr.status}`
+    if (!xhr.data) {
+      // data is null, xhr error
+      $log.error(JSON.stringify(xhr));
+    } else {
       switch (typeof xhr.data) {
         case "string":
           $rootScope.err += ` :${xhr.data}`;
@@ -12,13 +15,12 @@ app.factory("reqerr", function ($rootScope, $log) {
           if ("error" in xhr.data) {
             $rootScope.err += ` :${xhr.data.error}`;
           } else {
-            $rootScope.err += JSON.stringify(xhr.data);
+            $rootScope.err += JSON.stringify(xhr);
           }
-          break
+          break;
       }
-      $log.error(xhr.data);
-      $rootScope.$applyAsync();
     }
+    $rootScope.$applyAsync();
     return xhr;
   };
 });