Changing graphql server status to return the MongooseIM version

big_tests/tests/graphql_server_SUITE.erl

@@ -133,7 +133,9 @@ set_and_get_loglevel_test(Config) ->
 get_status_test(Config) ->
     Result = get_ok_value([data, server, status], get_status(Config)),
     ?assertEqual(<<"RUNNING">>, maps:get(<<"statusCode">>, Result)),
-    ?assert(is_binary(maps:get(<<"message">>, Result))).
+    ?assert(is_binary(maps:get(<<"message">>, Result))),
+    ?assert(is_binary(maps:get(<<"version">>, Result))).
+
 
 join_successful(Config) ->
     #{node := Node2} = RPCSpec2 = mim2(),

priv/graphql/schemas/admin/server.gql

@@ -46,6 +46,8 @@ type Status {
   statusCode: StatusCode
   "Message about the status"
   message: String
+  "MongooseIM version"
+  version: String
 }
 
 "Specifies status of the server"

src/ejabberd_admin.erl

@@ -28,6 +28,7 @@
 
 -export([start/0, stop/0,
          %% Server
+         status/0,
          %% Accounts
          register/3, register/2, unregister/2,
          registered_users/1,
@@ -65,7 +66,7 @@ commands() ->
      %% They are defined here so that other interfaces can use them too
      #ejabberd_commands{name = status, tags = [server],
                         desc = "Get status of the ejabberd server",
-                        module = mongoose_server_api, function = status,
+                        module = ?MODULE, function = status,
                         args = [], result = {res, restuple}},
      #ejabberd_commands{name = restart, tags = [server],
                         desc = "Restart ejabberd gracefully",
@@ -169,6 +170,13 @@ commands() ->
                         result = {res, restuple}}
     ].
 
+%%%
+%%% Commands
+%%%
+-spec status() -> {ok, {boolean(), iolist()}} | {mongooseim_not_running, iolist()}.
+status() ->
+    {ok, {Status, Message, _}} = mongoose_server_api:status(),
+    {ok, {Status, Message}}.
 
 %%%
 %%% Server management

src/graphql/admin/mongoose_graphql_server_admin_query.erl

@@ -8,8 +8,9 @@
 -include("../mongoose_graphql_types.hrl").
 
 execute(_Ctx, server, <<"status">>, _) ->
-    {ok, {Status, String}} = mongoose_server_api:status(),
-    {ok, #{<<"statusCode">> => status_code(Status), <<"message">> => String}};
+    {ok, {Status, Message, Version}} = mongoose_server_api:status(),
+    {ok, #{<<"statusCode">> => status_code(Status), <<"message">> => Message,
+           <<"version">> => Version}};
 execute(_Ctx, server, <<"getLoglevel">>, _) ->
     mongoose_server_api:get_loglevel();
 execute(_Ctx, server, <<"getCookie">>, _) ->

src/mongoose_server_api.erl

@@ -39,7 +39,8 @@ status() ->
                 {false, String1 ++ " MongooseIM is not running in that node."};
             {value, {_, _, Version}} ->
                 {true,
-                 String1 ++ io_lib:format(" MongooseIM ~s is running in that node.", [Version])}
+                 String1 ++ io_lib:format(" MongooseIM ~s is running in that node.", [Version]),
+                 lists:nth(1, string:split(Version, "-"))}
         end,
     {ok, Result}.