Stn/status page ohne mesh (prometheus#920)

* Render status page without mesh connection (prometheus#918) A mesh connection was assumed, even though the value that was being passed into the helper function was a possibly-nil pointer. Add a check for this, and return a nil value in that case. The frontend finds this when decoding the json payload, and displays the "not configured" message. * Update bindata
iksaif · Sep 14, 2017 · 04715e1 · 04715e1
1 parent dd290d5
commit 04715e1
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 25 deletions.
diff --git a/api/api.go b/api/api.go
@@ -181,7 +181,7 @@ func (api *API) status(w http.ResponseWriter, req *http.Request) {
 		ConfigJSON  *config.Config    `json:"configJSON"`
 		VersionInfo map[string]string `json:"versionInfo"`
 		Uptime      time.Time         `json:"uptime"`
-		MeshStatus  meshStatus        `json:"meshStatus"`
+		MeshStatus  *meshStatus       `json:"meshStatus"`
 	}{
 		ConfigYAML: api.config.String(),
 		ConfigJSON: api.config,
@@ -214,9 +214,13 @@ type peerStatus struct {
 	UID      uint64 `json:"uid"`      // e.g. "14015114173033265000"
 }
 
-func getMeshStatus(api *API) meshStatus {
+func getMeshStatus(api *API) *meshStatus {
+	if api.mrouter == nil {
+		return nil
+	}
+
 	status := mesh.NewStatus(api.mrouter)
-	strippedStatus := meshStatus{
+	strippedStatus := &meshStatus{
 		Name:     status.Name,
 		NickName: status.NickName,
 		Peers:    make([]peerStatus, len(status.Peers)),

diff --git a/ui/app/src/Status/Api.elm b/ui/app/src/Status/Api.elm
@@ -3,7 +3,7 @@ module Status.Api exposing (getStatus)
 import Utils.Api exposing (send, get)
 import Utils.Types exposing (ApiData)
 import Status.Types exposing (StatusResponse, VersionInfo, MeshStatus, MeshPeer)
-import Json.Decode exposing (Decoder, map2, string, field, at, list, int)
+import Json.Decode exposing (Decoder, map2, string, field, at, list, int, maybe)
 
 
 getStatus : String -> (ApiData StatusResponse -> msg) -> Cmd msg
@@ -29,7 +29,7 @@ decodeData =
         (field "configYAML" string)
         (field "uptime" string)
         (field "versionInfo" decodeVersionInfo)
-        (field "meshStatus" decodeMeshStatus)
+        (field "meshStatus" (maybe decodeMeshStatus))
 
 
 decodeVersionInfo : Decoder VersionInfo

diff --git a/ui/app/src/Status/Types.elm b/ui/app/src/Status/Types.elm
@@ -5,7 +5,7 @@ type alias StatusResponse =
     { config : String
     , uptime : String
     , versionInfo : VersionInfo
-    , meshStatus : MeshStatus
+    , meshStatus : Maybe MeshStatus
     }
 
 

diff --git a/ui/app/src/Views/Status/Views.elm b/ui/app/src/Views/Status/Views.elm
@@ -51,24 +51,34 @@ viewConfig config =
         ]
 
 
-viewMeshStatus : MeshStatus -> Html Types.Msg
+viewMeshStatus : Maybe MeshStatus -> Html Types.Msg
 viewMeshStatus meshStatus =
-    span []
-        [ h2 [] [ text "Mesh Status" ]
-        , div [ class "form-group row" ]
-            [ b [ class "col-sm-2" ] [ text "Name:" ]
-            , div [ class "col-sm-10" ] [ text meshStatus.name ]
-            ]
-        , div [ class "form-group row" ]
-            [ b [ class "col-sm-2" ] [ text "Nick Name:" ]
-            , div [ class "col-sm-10" ] [ text meshStatus.nickName ]
-            ]
-        , div [ class "form-group row" ]
-            [ b [ class "col-sm-2" ] [ text "Peers:" ]
-            , ul [ class "col-sm-10" ] <|
-                List.map viewMeshPeer meshStatus.peers
-            ]
-        ]
+    case meshStatus of
+        Just meshStatus ->
+            span []
+                [ h2 [] [ text "Mesh Status" ]
+                , div [ class "form-group row" ]
+                    [ b [ class "col-sm-2" ] [ text "Name:" ]
+                    , div [ class "col-sm-10" ] [ text meshStatus.name ]
+                    ]
+                , div [ class "form-group row" ]
+                    [ b [ class "col-sm-2" ] [ text "Nick Name:" ]
+                    , div [ class "col-sm-10" ] [ text meshStatus.nickName ]
+                    ]
+                , div [ class "form-group row" ]
+                    [ b [ class "col-sm-2" ] [ text "Peers:" ]
+                    , ul [ class "col-sm-10" ] <|
+                        List.map viewMeshPeer meshStatus.peers
+                    ]
+                ]
+
+        Nothing ->
+            span []
+                [ h2 [] [ text "Mesh Status" ]
+                , div [ class "form-group row" ]
+                    [ div [ class "col-sm-10" ] [ text "Mesh not configured" ]
+                    ]
+                ]
 
 
 viewMeshPeer : MeshPeer -> Html Types.Msg

diff --git a/ui/bindata.go b/ui/bindata.go