Răsfoiți Sursa

increased rlimit-nproc and added health check for converting image

Henry Oswald 9 ani în urmă
părinte
comite
27139bc433

+ 6 - 12
services/filestore/app.coffee

@@ -5,10 +5,10 @@ settings = require("settings-sharelatex")
 request = require("request")
 fileController = require("./app/js/FileController")
 keyBuilder = require("./app/js/KeyBuilder")
+healthCheckController = require("./app/js/HealthCheckController")
 domain = require("domain")
 appIsOk = true
 app = express()
-streamBuffers = require("stream-buffers")
 
 Metrics = require "metrics-sharelatex"
 Metrics.initialize("filestore")
@@ -102,17 +102,11 @@ app.get '/status', (req, res)->
 		logger.log "app is not ok - shutting down"
 		res.send("server is being shut down", 500)
 
-app.get "/health_check", (req, res)->
-	req.params.project_id = settings.health_check.project_id
-	req.params.file_id = settings.health_check.file_id
-	myWritableStreamBuffer = new streamBuffers.WritableStreamBuffer(initialSize: 100)
-	keyBuilder.userFileKey req, res, ->
-		fileController.getFile req, myWritableStreamBuffer
-		myWritableStreamBuffer.on "close", ->
-			if myWritableStreamBuffer.size() > 0
-				res.send(200)
-			else
-				res.send(503)
+
+app.get "/health_check", healthCheckController.check
+	
+
+
 
 app.get '*', (req, res)->
 	res.send 404

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
services/filestore/firejail/convert.profile


+ 1 - 0
services/filestore/package.json

@@ -11,6 +11,7 @@
     "aws-sdk": "^2.1.39",
     "coffee-script": "~1.7.1",
     "express": "~3.4.8",
+    "fs-extra": "^1.0.0",
     "heapdump": "^0.3.2",
     "knox": "~0.9.1",
     "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.1.0",

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff