Skip to content

Commit 118a7ce

Browse files
committed
added favicon.svg and vars to status.json
1 parent 5803aac commit 118a7ce

4 files changed

Lines changed: 44 additions & 6 deletions

File tree

deploy.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,10 @@
22
#
33
# deploy to Google AppEngine
44
#
5+
xmlstarlet edit --inplace --update "//_:property[@name='COMMIT']/@value" -v $(git rev-parse --short HEAD) www/WEB-INF/appengine-web.xml
6+
xmlstarlet edit --inplace --update "//_:property[@name='LASTMOD']/@value" -v $(date -u +%Y-%m-%dT%H:%M:%SZ) www/WEB-INF/appengine-web.xml
7+
58
gcloud beta app deploy --project=ff-pdf2txt --verbosity=info www
9+
10+
xmlstarlet edit --inplace --update "//_:property[@name='COMMIT']/@value" -v dev www/WEB-INF/appengine-web.xml
11+
xmlstarlet edit --inplace --update "//_:property[@name='LASTMOD']/@value" -v dev www/WEB-INF/appengine-web.xml

www/WEB-INF/appengine-web.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
3-
<runtime>java8</runtime>
4-
<system-properties>
5-
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
6-
</system-properties>
7-
<threadsafe>true</threadsafe>
3+
<runtime>java8</runtime>
4+
<system-properties>
5+
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
6+
<property name="COMMIT" value="dev"/>
7+
<property name="LASTMOD" value="dev"/>
8+
</system-properties>
9+
<threadsafe>true</threadsafe>
810
</appengine-web-app>

www/favicon.svg

Lines changed: 21 additions & 0 deletions
Loading

www/status.jsp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
<%@ page contentType="text/plain;charset=utf-8"
2-
import="org.json.simple.*"
2+
import="java.time.*,
3+
java.time.format.*,
4+
org.json.simple.*"
35
%><%
46
JSONObject retVal = new JSONObject();
57
retVal.put("success", Boolean.TRUE);
68
retVal.put("message", "OK");
9+
retVal.put("commit", System.getProperty("COMMIT", "(unknown)"));
10+
retVal.put("timestamp", ZonedDateTime.now( ZoneOffset.UTC ).format( DateTimeFormatter.ISO_INSTANT ));
11+
retVal.put("lastmod", System.getProperty("LASTMOD", "(unknown)"));
12+
retVal.put("tech", "Java " + System.getProperty("java.specification.version", "(unknown)"));
713
retVal.put("version", System.getProperty("java.version", "Unknown") + " (" + System.getProperty("java.vm.name", "Unknown VM") + ")");
814
retVal.put("java.vendor", System.getProperty("java.vendor"));
915
retVal.put("java.version", System.getProperty("java.version"));
@@ -29,6 +35,9 @@
2935
}
3036
else
3137
{
38+
response.setHeader("Access-Control-Allow-Origin", "*");
39+
response.setHeader("Access-Control-Allow-Methods", "GET, POST");
40+
response.setHeader("Access-Control-Max-Age", "604800");
3241
out.print(json);
3342
}
3443
%>

0 commit comments

Comments
 (0)