Fix up max-age (again)

app.js

@@ -103,7 +103,7 @@ function compilerProps(property, defaultValue) {
     return gccProps(property, defaultValue); // gccProps comes from lib/compile.js
 }
 require('./lib/compile').initialise(gccProps, compilerProps);
-var staticMaxAgeMs = gccProps('staticMaxAgeMs', 0);
+var staticMaxAgeSecs = gccProps('staticMaxAgeSecs', 0);
 
 var awsProps = props.propsFor("aws");
 var awsPoller = null;
@@ -176,7 +176,7 @@ function ClientOptionsHandler(fileSources) {
     };
     this.handler = function getClientOptions(req, res) {
         res.set('Content-Type', 'application/json');
-        res.set('Cache-Control', 'public, max-age=' + staticMaxAgeMs);
+        res.set('Cache-Control', 'public, max-age=' + staticMaxAgeSecs);
         res.end(text);
     };
 }
@@ -199,7 +199,7 @@ function getSource(req, res, next) {
         return;
     }
     action.apply(handler, bits.slice(3).concat(function (err, response) {
-        res.set('Cache-Control', 'public, max-age=' + staticMaxAgeMs);
+        res.set('Cache-Control', 'public, max-age=' + staticMaxAgeSecs);
         if (err) {
             res.end(JSON.stringify({err: err}));
         } else {
@@ -503,7 +503,7 @@ findCompilers().then(function (compilers) {
         .use(logger('combined'))
         .use(compression())
         .use(sFavicon(staticDir + '/favicon.ico'))
-        .use(sStatic(staticDir, {maxAge: staticMaxAgeMs}))
+        .use(sStatic(staticDir, {maxAge: staticMaxAgeSecs * 1000}))
         .use(bodyParser.json())
         .use(restreamer())
         .get('/client-options.json', clientOptionsHandler.handler)

etc/config/gcc-explorer.amazon.properties

@@ -3,7 +3,7 @@ googleApiKey=AIzaSyAaz35KJv8DA0ABoime0fEIh32NmbyYbcQ
 compileTimeoutMs=5000
 compiler-wrapper=./c-preload/compiler-wrapper
 max-asm-size=8388608
-staticMaxAgeMs=30000
+staticMaxAgeSecs=30
 cacheMb=50
 clientGoogleAnalyticsEnabled=true
 proxyRetries=300

etc/config/gcc-explorer.defaults.properties

@@ -5,7 +5,7 @@ defaultSource=builtin
 cacheMb=50
 language=C++
 maxConcurrentCompiles=2
-staticMaxAgeMs=1000
+staticMaxAgeSecs=1
 optionsWhitelistRe=.*
 optionsBlacklistRe=^(-W[alp],)?((-wrapper|-fplugin.*|-specs|-load|-plugin|(@.*)|-I|-i)(=.*)?|--)$
 allowedShortUrlHostRe=^([-a-z.]+\.)?(xania|godbolt)\.org$