fixes #2556 (#2557)

* fixes #2556 * slight cleanup
GMOD · Jan 28, 2021 · 99188e5 · 99188e5
1 parent 632cbe7
commit 99188e5
Show file tree

Hide file tree

Showing 3 changed files with 1,750 additions and 1,720 deletions.
diff --git a/grails-app/conf/UrlMappings.groovy b/grails-app/conf/UrlMappings.groovy
@@ -20,6 +20,7 @@ class UrlMappings {
         "/"(redirect: '/annotator/index')
         "500"(view: '/error')
         "/menu"(view: '/menu')
+        "/system"(controller: "annotator", action: "system")
         "/${clientToken}/version.jsp"(controller: 'annotator', view: "version")
         "/about"(controller: 'annotator', view: "about")
         "/${clientToken}/about"(controller: 'annotator', view: "about")

diff --git a/grails-app/controllers/org/bbop/apollo/AnnotatorController.groovy b/grails-app/controllers/org/bbop/apollo/AnnotatorController.groovy
@@ -724,12 +724,21 @@ class AnnotatorController {
 /**
  * This is a public passthrough to version
  */
-    def version() {
-        println "version "
-    }
-
+  @RestApiMethod(description = "Get system info", path = "/system", verb = RestApiVerb.GET)
+  @RestApiParams(params = [])
+  def system() {
+    def jsonObject = new JSONObject()
+    jsonObject.apollo_version = grails.util.Metadata.current['app.version']
+    jsonObject.grails_version = GroovySystem.getVersion()
+    jsonObject.jvm_version = System.getProperty("java.version")
+    jsonObject.serverInfo = servletContext.getServerInfo()
+    jsonObject.jbrowse_branch = grailsApplication.config?.jbrowse?.git
+    jsonObject.jbrowse_url = grailsApplication.config?.jbrowse?.git?.url
+    render jsonObject as JSON
+  }
+
+  // used in the view
     def about() {
-        println "about . . . . "
     }
 /**
  * This is a very specific method for the GWT interface.