Преглед на файлове

HTTP request logging format

master
peter преди 5 години
родител
ревизия
7e2c1d5761
променени са 4 файла, в които са добавени 16 реда и са изтрити 5 реда
  1. 1
    1
      src/backend/Admin/Admin.ts
  2. 3
    3
      src/backend/Components/Item/ItemManager.ts
  3. 11
    0
      src/backend/Components/Raid/RaidManager.ts
  4. 1
    1
      src/frontend/server.ts

+ 1
- 1
src/backend/Admin/Admin.ts Целия файл

148
             try{
148
             try{
149
                 const filepath = Path.join(__dirname, distFolder, 'browser', decodeURIComponent(req.path))
149
                 const filepath = Path.join(__dirname, distFolder, 'browser', decodeURIComponent(req.path))
150
                 if(!existsSync(filepath)){
150
                 if(!existsSync(filepath)){
151
-                    throw new Error("Bad file access: "+filepath)
151
+                    throw new Error("FAILED REQUEST "+filepath+ " FROM "+req.ip)
152
                 }
152
                 }
153
                 res.sendFile(filepath)
153
                 res.sendFile(filepath)
154
                 res.status(200)
154
                 res.status(200)

+ 3
- 3
src/backend/Components/Item/ItemManager.ts Целия файл

253
                     itemname: item.itemname
253
                     itemname: item.itemname
254
                 })
254
                 })
255
         } else {
255
         } else {
256
-            getLogger('ItemManager').debug('new reserve')
256
+            //getLogger('ItemManager').debug('new reserve')
257
             await this.admin
257
             await this.admin
258
                 .knex(item.tier + 'tokens')
258
                 .knex(item.tier + 'tokens')
259
                 .transacting(tx)
259
                 .transacting(tx)
374
     }
374
     }
375
 
375
 
376
     decayTokens = async (tier: Tiers, amount = 1) => {
376
     decayTokens = async (tier: Tiers, amount = 1) => {
377
-        getLogger('ItemManager#decayTokens').debug(tier)
377
+        //getLogger('ItemManager#decayTokens').debug(tier)
378
 
378
 
379
         await this.admin
379
         await this.admin
380
         .knex(tier + 'tokens')
380
         .knex(tier + 'tokens')
387
     }
387
     }
388
 
388
 
389
     decayTokensOfCharacter = async (tier: Tiers, character:Character) => {
389
     decayTokensOfCharacter = async (tier: Tiers, character:Character) => {
390
-        getLogger('ItemManager#decayTokensOfCharacter').debug(character, tier)
390
+        //getLogger('ItemManager#decayTokensOfCharacter').debug(character, tier)
391
         await this.admin
391
         await this.admin
392
         .knex(tier + 'tokens')
392
         .knex(tier + 'tokens')
393
         .where({
393
         .where({

+ 11
- 0
src/backend/Components/Raid/RaidManager.ts Целия файл

307
             .where('id', '=', raid.id)
307
             .where('id', '=', raid.id)
308
             .first()
308
             .first()
309
 
309
 
310
+        if(!raidInDb){
311
+            return {
312
+                title : "Not found", 
313
+                description : "Not found", 
314
+                start: "0", 
315
+                size: 0, 
316
+                tier: null,
317
+                ... raiddata
318
+            }
319
+        }
320
+
310
         const characterData: (Signup & Character & Spec)[] = await this.admin
321
         const characterData: (Signup & Character & Spec)[] = await this.admin
311
             .knex('signups as s')
322
             .knex('signups as s')
312
             .select('s.id as id', 'charactername', 'rank', 'class', 'specid', 'specname', 'race', 'userid', 'benched', 'late', 'raidid', 'characterid', 'specid', 'memo', 'timestamp', 'absent')
323
             .select('s.id as id', 'charactername', 'rank', 'class', 'specid', 'specname', 'race', 'userid', 'benched', 'late', 'raidid', 'characterid', 'specid', 'memo', 'timestamp', 'absent')

+ 1
- 1
src/frontend/server.ts Целия файл

57
   );
57
   );
58
 
58
 
59
   app.get('*', (req, res) => {
59
   app.get('*', (req, res) => {
60
-    loggerService.log(req.path, req.ip)
60
+    loggerService.log("REQUEST "+req.path +" FROM "+ req.ip)
61
     try{
61
     try{
62
       res.render(resolve(STATIC_FOLDER, 'browser/index'), { req, res })
62
       res.render(resolve(STATIC_FOLDER, 'browser/index'), { req, res })
63
     }catch(e){
63
     }catch(e){

Loading…
Отказ
Запис