Fix #4569; Return both DB and JS patch levels in __version__

mozilla-services · Jul 4, 2018 · 4b046a8 · 4b046a8
1 parent cb96507
commit 4b046a8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/server/src/dbschema.js b/server/src/dbschema.js
@@ -166,6 +166,7 @@ function getCurrentDbPatchLevel() {
     return 0;
   });
 }
+exports.getCurrentDbPatchLevel = getCurrentDbPatchLevel;
 
 exports.connectionOK = function() {
   if (!keys) {

diff --git a/server/src/server.js b/server/src/server.js
@@ -959,19 +959,24 @@ app.get("/images/:imageid", function(req, res) {
 });
 
 app.get("/__version__", function(req, res) {
-  const response = {
-    source: "https://github.com/mozilla-services/screenshots/",
-    description: "Firefox Screenshots application server",
-    version: selfPackage.version,
-    buildDate: buildTime,
-    commit: linker.getGitRevision(),
-    contentOrigin: config.contentOrigin,
-    commitLog: `https://github.com/mozilla-services/screenshots/commits/${linker.getGitRevision()}`,
-    unincludedCommits: `https://github.com/mozilla-services/screenshots/compare/${linker.getGitRevision()}...master`,
-    dbSchemaVersion: dbschema.MAX_DB_LEVEL
-  };
-  res.header("Content-Type", "application/json; charset=utf-8");
-  res.send(JSON.stringify(response, null, "  "));
+  dbschema.getCurrentDbPatchLevel().then(level => {
+    const response = {
+      source: "https://github.com/mozilla-services/screenshots/",
+      description: "Firefox Screenshots application server",
+      version: selfPackage.version,
+      buildDate: buildTime,
+      commit: linker.getGitRevision(),
+      contentOrigin: config.contentOrigin,
+      commitLog: `https://github.com/mozilla-services/screenshots/commits/${linker.getGitRevision()}`,
+      unincludedCommits: `https://github.com/mozilla-services/screenshots/compare/${linker.getGitRevision()}...master`,
+      dbSchemaVersion: level,
+      dbSchemaVersionJS: dbschema.MAX_DB_LEVEL
+    };
+    res.header("Content-Type", "application/json; charset=utf-8");
+    res.send(JSON.stringify(response, null, "  "));
+  }).catch((e) => {
+    errorResponse(res, "Error fetching version data: ", e);
+  });
 });
 
 app.get("/contribute.json", function(req, res) {