diff --git a/src/backend/Admin/Admin.ts b/src/backend/Admin/Admin.ts index d383477..37fcaf3 100644 --- a/src/backend/Admin/Admin.ts +++ b/src/backend/Admin/Admin.ts @@ -148,7 +148,7 @@ export class FrontworkAdmin try{ const filepath = Path.join(__dirname, distFolder, 'browser', decodeURIComponent(req.path)) if(!existsSync(filepath)){ - throw new Error("Bad file access: "+filepath) + throw new Error("FAILED REQUEST "+filepath+ " FROM "+req.ip) } res.sendFile(filepath) res.status(200) diff --git a/src/backend/Components/Item/ItemManager.ts b/src/backend/Components/Item/ItemManager.ts index 79e99a4..896cc40 100644 --- a/src/backend/Components/Item/ItemManager.ts +++ b/src/backend/Components/Item/ItemManager.ts @@ -253,7 +253,7 @@ export class ItemManager itemname: item.itemname }) } else { - getLogger('ItemManager').debug('new reserve') + //getLogger('ItemManager').debug('new reserve') await this.admin .knex(item.tier + 'tokens') .transacting(tx) @@ -374,7 +374,7 @@ export class ItemManager } decayTokens = async (tier: Tiers, amount = 1) => { - getLogger('ItemManager#decayTokens').debug(tier) + //getLogger('ItemManager#decayTokens').debug(tier) await this.admin .knex(tier + 'tokens') @@ -387,7 +387,7 @@ export class ItemManager } decayTokensOfCharacter = async (tier: Tiers, character:Character) => { - getLogger('ItemManager#decayTokensOfCharacter').debug(character, tier) + //getLogger('ItemManager#decayTokensOfCharacter').debug(character, tier) await this.admin .knex(tier + 'tokens') .where({ diff --git a/src/backend/Components/Raid/RaidManager.ts b/src/backend/Components/Raid/RaidManager.ts index 84b71ff..44de05c 100644 --- a/src/backend/Components/Raid/RaidManager.ts +++ b/src/backend/Components/Raid/RaidManager.ts @@ -307,6 +307,17 @@ export class RaidManager .where('id', '=', raid.id) .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 .knex('signups as s') .select('s.id as id', 'charactername', 'rank', 'class', 'specid', 'specname', 'race', 'userid', 'benched', 'late', 'raidid', 'characterid', 'specid', 'memo', 'timestamp', 'absent') diff --git a/src/frontend/server.ts b/src/frontend/server.ts index 74be64e..f48d510 100644 --- a/src/frontend/server.ts +++ b/src/frontend/server.ts @@ -57,7 +57,7 @@ export async function attachExpress(app, staticDir = "./dist", logger = console) ); app.get('*', (req, res) => { - loggerService.log(req.path, req.ip) + loggerService.log("REQUEST "+req.path +" FROM "+ req.ip) try{ res.render(resolve(STATIC_FOLDER, 'browser/index'), { req, res }) }catch(e){