HTTP request logging format

This commit is contained in:
peter
2020-10-02 18:42:46 +02:00
parent 1765c2eabc
commit 7e2c1d5761
4 changed files with 16 additions and 5 deletions
+1 -1
View File
@@ -148,7 +148,7 @@ export class FrontworkAdmin
try{ try{
const filepath = Path.join(__dirname, distFolder, 'browser', decodeURIComponent(req.path)) const filepath = Path.join(__dirname, distFolder, 'browser', decodeURIComponent(req.path))
if(!existsSync(filepath)){ if(!existsSync(filepath)){
throw new Error("Bad file access: "+filepath) throw new Error("FAILED REQUEST "+filepath+ " FROM "+req.ip)
} }
res.sendFile(filepath) res.sendFile(filepath)
res.status(200) res.status(200)
+3 -3
View File
@@ -253,7 +253,7 @@ export class ItemManager
itemname: item.itemname itemname: item.itemname
}) })
} else { } else {
getLogger('ItemManager').debug('new reserve') //getLogger('ItemManager').debug('new reserve')
await this.admin await this.admin
.knex(item.tier + 'tokens') .knex(item.tier + 'tokens')
.transacting(tx) .transacting(tx)
@@ -374,7 +374,7 @@ export class ItemManager
} }
decayTokens = async (tier: Tiers, amount = 1) => { decayTokens = async (tier: Tiers, amount = 1) => {
getLogger('ItemManager#decayTokens').debug(tier) //getLogger('ItemManager#decayTokens').debug(tier)
await this.admin await this.admin
.knex(tier + 'tokens') .knex(tier + 'tokens')
@@ -387,7 +387,7 @@ export class ItemManager
} }
decayTokensOfCharacter = async (tier: Tiers, character:Character) => { decayTokensOfCharacter = async (tier: Tiers, character:Character) => {
getLogger('ItemManager#decayTokensOfCharacter').debug(character, tier) //getLogger('ItemManager#decayTokensOfCharacter').debug(character, tier)
await this.admin await this.admin
.knex(tier + 'tokens') .knex(tier + 'tokens')
.where({ .where({
@@ -307,6 +307,17 @@ export class RaidManager
.where('id', '=', raid.id) .where('id', '=', raid.id)
.first() .first()
if(!raidInDb){
return {
title : "Not found",
description : "Not found",
start: "0",
size: 0,
tier: null,
... raiddata
}
}
const characterData: (Signup & Character & Spec)[] = await this.admin const characterData: (Signup & Character & Spec)[] = await this.admin
.knex('signups as s') .knex('signups as s')
.select('s.id as id', 'charactername', 'rank', 'class', 'specid', 'specname', 'race', 'userid', 'benched', 'late', 'raidid', 'characterid', 'specid', 'memo', 'timestamp', 'absent') .select('s.id as id', 'charactername', 'rank', 'class', 'specid', 'specname', 'race', 'userid', 'benched', 'late', 'raidid', 'characterid', 'specid', 'memo', 'timestamp', 'absent')
+1 -1
View File
@@ -57,7 +57,7 @@ export async function attachExpress(app, staticDir = "./dist", logger = console)
); );
app.get('*', (req, res) => { app.get('*', (req, res) => {
loggerService.log(req.path, req.ip) loggerService.log("REQUEST "+req.path +" FROM "+ req.ip)
try{ try{
res.render(resolve(STATIC_FOLDER, 'browser/index'), { req, res }) res.render(resolve(STATIC_FOLDER, 'browser/index'), { req, res })
}catch(e){ }catch(e){