diff --git a/app.js b/app.js index 5555393..1cbeaf3 100644 --- a/app.js +++ b/app.js @@ -18,6 +18,12 @@ app.use(bodyParser.urlencoded({ extended: false })); app.use(cookieParser()); app.use(express.static(path.join(__dirname, 'public'))); +app.use(function(req, res, next) { + res.header("Access-Control-Allow-Origin", "*"); + res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); + next(); +}); + app.use('/', require('./routes/index')); app.use('/api', require('./routes/api')); diff --git a/routes/api.js b/routes/api.js index 6bf73c6..b33029a 100644 --- a/routes/api.js +++ b/routes/api.js @@ -24,6 +24,7 @@ var workers = (function(){ image: workers.settings.image, size: workers.settings.size, onCreate: function(data){ + console.log(data) doapi.dropletSetTag('clwV'+workers.settings.version, data.droplet.id); }, onActive: function(worker, args){ @@ -116,7 +117,7 @@ var workers = (function(){ console.log('blocked outdated worker', workers.settings.image, args.worker.image.id) return ; } - args.stopPercent = args.stopPercent || 20; + args.stopPercent = args.stopPercent || 80; args.onStart = args.onStart || function(){}; args.onDone = args.onDone || function(){}; @@ -390,6 +391,7 @@ router.get('/liststuff', function(req, res, next){ }); router.get('/ping/:runner', function(req, res, next){ + var runner = label2runner[req.params.runner]; runnerTimeout(runner); res.json({res:''}); }); diff --git a/routes/workers.json b/routes/workers.json index 231c92a..1de1734 100644 --- a/routes/workers.json +++ b/routes/workers.json @@ -1 +1 @@ -{"image":"17641214","version":5,"lastSnapShotId":"0","size":"2gb","max":100,"min":1,"minAvail":1} \ No newline at end of file +{"image":"23505298","version":9,"lastSnapShotId":"18670778","size":"512mb","max":100,"min":3,"minAvail":3} diff --git a/workers.json b/workers.json index 2589c94..0a6e3c2 100644 --- a/workers.json +++ b/workers.json @@ -1,6 +1,6 @@ { - "image": "18607562", - "version": 5, + "image": "23469057", + "version": 8, "size": "512mb", "max": 100, "min": 3,