yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 02:29:26 +02:00
Code Issues Releases Wiki Activity

Too much overlap in storage plugin URLs for meaningful loadbalancing and config simplicity. Make poorxy emulate the real situation and change related URLs.

Browse source
This commit is contained in:
Simo Kinnunen 2015-01-07 14:04:36 +09:00
parent 7c16c40dae
commit 8b9e5d58c9
8 changed files with 70 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/units/storage/plugins/apk/index.js
View file

@ -1,8 +1,9 @@
var http = require('http')
var url = require('url')
var util = require('util')
var express = require('express')
var httpProxy = require('http-proxy')
var request = require('request')
var logger = require('../../../../util/logger')
var download = require('../../../../util/download')
@ -12,18 +13,18 @@ module.exports = function(options) {
var log = logger.createLogger('storage:plugins:apk')
, app = express()
, server = http.createServer(app)
, proxy = httpProxy.createProxyServer()
proxy.on('error', function(err) {
log.error('Proxy had an error', err.stack)
})
app.set('strict routing', true)
app.set('case sensitive routing', true)
app.set('trust proxy', true)
app.get('/s/api/v1/apk/:id/*/manifest', function(req, res) {
download(url.resolve(options.storageUrl, req.url), {
app.get('/s/apk/:id/:name/manifest', function(req, res) {
var orig = util.format(
'/s/blob/%s/%s'
, req.params.id
, req.params.name
)
download(url.resolve(options.storageUrl, orig), {
dir: options.cacheDir
})
.then(manifest)
@ -43,10 +44,13 @@ module.exports = function(options) {
})
})
app.get('/s/api/v1/apk/:id/*', function(req, res) {
proxy.web(req, res, {
target: options.storageUrl
})
app.get('/s/apk/:id/:name', function(req, res) {
request(url.resolve(options.storageUrl, util.format(
'/s/blob/%s/%s'
, req.params.id
, req.params.name
)))
.pipe(res)
})
server.listen(options.port)

10
lib/units/storage/plugins/image/index.js
View file

@ -1,4 +1,5 @@
var http = require('http')
var util = require('util')
var express = require('express')
@ -20,9 +21,14 @@ module.exports = function(options) {
app.set('trust proxy', true)
app.get(
'/s/api/v1/image/:id/*/transform'
'/s/image/:id/:name'
, requtil.limit(options.concurrency, function(req, res) {
return get(req.url, options)
var orig = util.format(
'/s/blob/%s/%s'
, req.params.id
, req.params.name
)
return get(orig, options)
.then(function(stream) {
return transform(stream, {
crop: parseCrop(req.query.crop)