accounting_fix #1

Merged
andrea.dellamico merged 2 commits from accounting_fix into master 2023-05-03 16:37:00 +02:00
2 changed files with 4 additions and 3 deletions

View File

@ -78,7 +78,7 @@ nginx_virthosts:
other_opts:
- 'internal'
- 'proxy_method POST'
- 'proxy_set_header Authorization "$auth_token"'
- 'proxy_set_header gcube-token "$auth_token"'
- 'proxy_set_header Content-Type "application/json"'
- location: /_homeserv
target: 'https://192.168.100.54/'

View File

@ -40,7 +40,8 @@ function enforce(r) {
debug(context, "[SHINYPROXY] response status: " + reply.status)
copyHeaders(context, reply.headersOut, r.headersOut)
closeAccountingRecord(context.record, (reply.status === 200 || reply.status === 201 || reply.status === 204 || reply.status === 302))
context.request.subrequest("/_accounting", { detached : true, body : JSON.stringify(context.record) })
debug(context, "Accounting record is: " + njs.dump(context.record))
context.request.subrequest("/_accounting", { detached : true, body : JSON.stringify([context.record]) })
if(reply.status === 301 || reply.status === 302){
r.return(reply.status, reply.headersOut["Location"])
}else{
@ -96,7 +97,7 @@ function buildAccountingRecord(context){
"duration": 0,
"maxInvocationTime": 0,
"scope": context.userinfo.context,
"host": context.request.host,
"host": context.request.headersIn.host,
"startTime": t,
"id": uuid(),
"calledMethod": context.request.method + " " + context.request.uri,