Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 9a93614

Browse files
rootelementrootelement
committed
Clarifying Logs
1 parent e0a953c commit 9a93614

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎src/controllers/migrationController.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ async function migrate () {
1212
// await migrationService.processChallengeTimelineTemplates()
1313

1414
if (!running) {
15-
logger.debug(' ### Migration Started')
15+
logger.debug('Migration :: ### Migration Started')
1616
running = true
1717
let page = 1
1818
const perPage = 10
@@ -25,10 +25,10 @@ async function migrate () {
2525
// logger.warn(`queuedChallenges ${JSON.stringify(queuedChallenges)}`)
2626
if (queuedChallenges.items.length <= 0) {
2727
running = false
28-
logger.info(`0 Challenges with status of ${config.MIGRATION_PROGRESS_STATUSES.QUEUED} for migration`)
28+
logger.info(`Migration :: 0 Challenges with status of ${config.MIGRATION_PROGRESS_STATUSES.QUEUED} for migration`)
2929
// break
3030
} else {
31-
logger.debug(`Migrating [${queuedChallenges.items.length}] Challenges`)
31+
logger.debug(`Migration :: Migrating [${queuedChallenges.items.length}] Challenges`)
3232
for (let i = 0; i < queuedChallenges.items.length; i += 1) {
3333
const legacyId = queuedChallenges.items[i].legacyId
3434
// await migrateChallenge(legacyId)
@@ -38,10 +38,10 @@ async function migrate () {
3838
page += 1
3939
}
4040
}
41-
logger.debug(' ### Migration Complete')
41+
logger.debug('Migration :: ### Migration Complete')
4242
// return true
4343
} else {
44-
logger.debug('!!!!!!!!!!! Tried to Migrate, Already Running')
44+
logger.debug('Migration :: !!!!!!!!!!! Tried to Migrate, Already Running')
4545
}
4646
}
4747

‎src/controllers/syncController.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,35 @@ async function syncQueuedChallenges () {
2525
// logger.warn(`queuedChallenges ${JSON.stringify(queuedChallenges)}`)
2626
if (queuedChallenges.items.length <= 0) {
2727
running = false
28-
logger.info(`0 Challenges with status of ${config.MIGRATION_PROGRESS_STATUSES.QUEUED} for sync`)
28+
logger.info(`Sync :: 0 Challenges with status of ${config.MIGRATION_PROGRESS_STATUSES.QUEUED} for sync`)
2929
// break
3030
} else {
31-
logger.debug(`Syncing [${queuedChallenges.items.length}] Challenges`)
31+
logger.debug(`Sync :: Syncing [${queuedChallenges.items.length}] Challenges`)
3232
// await Promise.all(queuedChallenges.items.map(item => syncLegacyId(item.legacyId, item.force)))
3333
try {
3434
for (let i = 0; i < queuedChallenges.items.length; i += 1) {
3535
const item = queuedChallenges.items[i]
3636
await syncService.syncLegacyId(item.legacyId, item.force)
3737
}
3838
} catch (e) {
39-
logger.error(`Caught Error: ${JSON.stringify(e)} - Resetting Sync}`)
39+
logger.error(`Sync :: Caught Error: ${JSON.stringify(e)} - Resetting Sync}`)
4040
running = false
4141
}
4242
page += 1
4343
}
4444
}
45-
logger.debug('Sync Complete')
45+
logger.debug('Sync :: ## Sync Complete')
4646
// return true
4747
} else {
48-
logger.debug('!!!!!!!!!!!! Tried to Sync, Already Running')
48+
logger.debug('Sync :: !!!!!!!!!!!! Tried to Sync, Already Running')
4949
}
5050
}
5151

5252
/**
5353
* Allow the Scheduler to call, pulls date from the DB
5454
*/
5555
async function autoQueueChallenges () {
56-
logger.info('Queueing existing failed challenges')
56+
logger.info('Sync :: Queueing existing failed challenges')
5757
await challengeSyncStatusService.retryFailed()
5858
const { total, updated } = await queueChallenges({ status: 'Active', force: false })
5959
return challengeSyncHistoryService.createHistoryRecord(total, updated)
@@ -81,7 +81,7 @@ async function queueChallenges (filter) {
8181
const totalChallengesCount = combinedArray.length
8282
// console.log('union length', combinedArray.length)
8383

84-
logger.debug(`Total to Sync ${totalChallengesCount}`)
84+
// logger.debug(`Sync :: Total to Sync ${totalChallengesCount}`)
8585
// logger.debug(`Combined Array ${combinedArray}`)
8686

8787
while (running) {
@@ -98,7 +98,7 @@ async function queueChallenges (filter) {
9898

9999
page += 1
100100
}
101-
logger.info(`Sync Queueing completed, ${queuedCount} of ${totalChallengesCount} challenges need to be synced`)
101+
logger.info(`Sync :: Sync Queueing completed, ${queuedCount} of ${totalChallengesCount} challenges need to be synced`)
102102
return { total: totalChallengesCount, updated: queuedCount }
103103
}
104104

@@ -110,12 +110,12 @@ async function queueChallenges (filter) {
110110
*/
111111
async function queueChallengeById (legacyId, withLogging = false, force = false) {
112112
if (withLogging) {
113-
logger.info(`Queue challenge with ID: ${legacyId}`)
113+
logger.info(`Sync :: Queue challenge with ID: ${legacyId}`)
114114
}
115115

116116
if (force === true) {
117117
// forced, do it anyway
118-
logger.info(`Sync of ${legacyId} is being forced`)
118+
logger.info(`Sync :: Sync of ${legacyId} is being forced`)
119119
return challengeSyncStatusService.queueForSync(legacyId, true)
120120
}
121121

@@ -125,7 +125,7 @@ async function queueChallengeById (legacyId, withLogging = false, force = false)
125125
if (existingQueuedList && existingQueuedList.total >= 1) {
126126
existingQueued = existingQueuedList.items[0]
127127
if (existingQueued.status === config.MIGRATION_PROGRESS_STATUSES.QUEUED) {
128-
logger.warn(`Legacy ID ${legacyId} already queued ${JSON.stringify(existingQueued)}`)
128+
logger.warn(`Sync :: Legacy ID ${legacyId} already queued ${JSON.stringify(existingQueued)}`)
129129
return false
130130
}
131131
}

‎src/services/migrationService.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ async function processChallenge (legacyId) {
1212
let v5ChallengeId = null
1313
try {
1414
await challengeMigrationStatusService.startMigration(legacyId, legacyChallengeLastModified)
15-
logger.debug(`${legacyId} - Start Challenge Migration`)
15+
// logger.debug(`${legacyId} - Start Challenge Migration`)
1616
v5ChallengeId = await challengeService.migrateChallenge(legacyId)
17-
logger.debug(`${legacyId} - Start Resource Migration`)
17+
// logger.debug(`${legacyId} - Start Resource Migration`)
1818
const resourcesMigrated = resourceService.migrateResourcesForChallenge(legacyId, v5ChallengeId)
19-
logger.debug(`${legacyId} - Completed Resource Migration`)
19+
// logger.debug(`${legacyId} - Completed Resource Migration`)
2020
await challengeMigrationStatusService.endMigration(legacyId, v5ChallengeId, config.MIGRATION_PROGRESS_STATUSES.SUCCESS)
2121
return { challengeId: v5ChallengeId, resourcesMigrated: resourcesMigrated }
2222
} catch (e) {
23-
logger.error(`Migration Failed for ${legacyId} ${e} ${JSON.stringify(e)}`)
23+
logger.error(`Migration :: Failed for ${legacyId} ${e} ${JSON.stringify(e)}`)
2424

2525
// delete challenge id
2626
if (v5ChallengeId) {
27-
logger.error(`Deleting partial challenge information for: ${v5ChallengeId}`)
27+
logger.error(`Migration :: Deleting partial challenge information for: ${v5ChallengeId}`)
2828
await challengeService.deleteChallenge(v5ChallengeId)
2929
}
3030

@@ -67,16 +67,16 @@ async function queueForMigration (legacyId) {
6767
// logger.debug(`migrateChallenge Record ${JSON.stringify(legacyIdProgress)}`)
6868
if (legacyIdProgress) {
6969
if (legacyIdProgress.status === config.MIGRATION_PROGRESS_STATUSES.IN_PROGRESS) {
70-
logger.info(`Challenge ${legacyId} in progress...`)
70+
logger.info(`Migration :: Challenge ${legacyId} in progress...`)
7171
return false
7272
}
7373
if (legacyIdProgress.status === config.MIGRATION_PROGRESS_STATUSES.SUCCESS) {
74-
logger.info(`Challenge ${legacyId} migrated previously.`)
74+
logger.info(`Migration :: Challenge ${legacyId} migrated previously.`)
7575
if (forceMigrate !== true) return false
7676
// logger.debug('Migrated Previously, but still continuing?')
7777
}
7878
if (legacyIdProgress.status === config.MIGRATION_PROGRESS_STATUSES.FAILED) {
79-
logger.error(`Challenge ${legacyId} Failed Previously with error: ${legacyIdProgressObj[0].errorMessage}`)
79+
logger.error(`Migration :: Challenge ${legacyId} Failed Previously with error: ${legacyIdProgressObj[0].errorMessage}`)
8080
if (forceMigrate !== true) return false
8181
}
8282
}

‎src/services/syncService.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ async function syncLegacyId (legacyId, force) {
2121
await processChallenge(legacyId, v4Listing.data, v4Detail.data)
2222
await challengeSyncStatusService.endSync(legacyId, v5.id, config.MIGRATION_PROGRESS_STATUSES.SUCCESS, `Resources: ${resourcesAdded} added, ${resourcesRemoved} removed`)
2323
} catch (e) {
24-
logger.error(`Sync Failed for ${legacyId} ${JSON.stringify(e)}`)
24+
logger.error(`Sync :: Failed for ${legacyId} ${JSON.stringify(e)}`)
2525
await challengeSyncStatusService.endSync(legacyId, null, config.MIGRATION_PROGRESS_STATUSES.FAILED, e, force === true)
2626
}
2727
} else {
2828
const progress = await challengeMigrationStatusService.getMigrationProgress({ legacyId }, 1, 1)
2929
if (progress.total < 1) {
30-
logger.warn(`Challenge ID ${legacyId} doesn't exist in v5, queueing for migration`)
30+
logger.warn(`Sync :: Challenge ID ${legacyId} doesn't exist in v5, queueing for migration`)
3131
await migrationService.queueForMigration(legacyId)
3232
} else {
33-
logger.debug(`Challenge ID ${legacyId} doesn't exist in v5 and is already queued for migration with a status of ${JSON.stringify(progress.items)}`)
33+
logger.debug(`Sync :: Challenge ID ${legacyId} doesn't exist in v5 and is already queued for migration with a status of ${JSON.stringify(progress.items)}`)
3434
}
3535
}
3636
}
@@ -57,7 +57,7 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
5757
const registrants = await resourceService.getResourcesFromV5API(v5ChallengeFromAPI.id, config.SUBMITTER_ROLE_ID)
5858
challengeObj.numOfRegistrants = _.toNumber(registrants.total)
5959
} catch (e) {
60-
logger.error(`Failed to load resources for challenge ${v5ChallengeFromAPI.id}`)
60+
logger.error(`Sync :: Failed to load resources for challenge ${v5ChallengeFromAPI.id}`)
6161
logger.logFullError(e)
6262
}
6363
// logger.info(`After V5 Reg Sync: ${challengeObj.numOfRegistrants} ${v5ChallengeFromAPI.numOfRegistrants}`)
@@ -66,7 +66,7 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
6666
const submissions = await challengeService.getChallengeSubmissionsFromV5API(legacyId, config.SUBMISSION_TYPE)
6767
challengeObj.numOfSubmissions = _.toNumber(submissions.total) || 0
6868
} catch (e) {
69-
logger.error(`Failed to load submissions for challenge ${legacyId}`)
69+
logger.error(`Sync :: Failed to load submissions for challenge ${legacyId}`)
7070
logger.logFullError(e)
7171
}
7272
// logger.info(`After V5 Sub Sync: ${challengeObj.numOfSubmissions} ${v5ChallengeFromAPI.numOfSubmissions}`)
@@ -77,7 +77,7 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
7777

7878
async function processResources (legacyId, challengeId, force) {
7979
if (force === true) {
80-
logger.warn(`Force Deleting Resources for LegacyID: ${legacyId} ChallengeID: ${challengeId}`)
80+
logger.warn(`Sync :: Force Deleting Resources for LegacyID: ${legacyId} ChallengeID: ${challengeId}`)
8181
await resourceService.deleteAllResourcesForChallenge(challengeId)
8282
}
8383
let resourcesAdded = 0
@@ -93,7 +93,7 @@ async function processResources (legacyId, challengeId, force) {
9393
// v5 memberId is a string
9494
// logger.debug(`Find resource in V5 ${JSON.stringify(v4Obj)}`)
9595
if (!_.find(currentV5Array.result, { memberId: _.toString(v4Obj.memberId), roleId: v4Obj.roleId })) {
96-
logger.debug(` ++ Resource Not Found, adding ${JSON.stringify({ memberId: v4Obj.memberId, roleId: v4Obj.roleId })}`)
96+
logger.debug(`Sync :: ++ Resource Not Found, adding ${JSON.stringify({ memberId: v4Obj.memberId, roleId: v4Obj.roleId })}`)
9797
await resourceService.saveResource(v4Obj)
9898
resourcesAdded += 1
9999
}
@@ -102,7 +102,7 @@ async function processResources (legacyId, challengeId, force) {
102102
const v5Obj = currentV5Array.result[i]
103103
// v4 memberId is a number
104104
if (!_.find(currentV4Array, { memberId: _.toString(v5Obj.memberId), roleId: v5Obj.roleId })) {
105-
logger.debug(` -- Resource Found, removing ${JSON.stringify({ memberId: v5Obj.memberId, roleId: v5Obj.roleId })}`)
105+
logger.debug(`Sync :: -- Resource Found, removing ${JSON.stringify({ memberId: v5Obj.memberId, roleId: v5Obj.roleId })}`)
106106
await resourceService.deleteResource(v5Obj.id)
107107
resourcesRemoved += 1
108108
}

0 commit comments

Comments
 (0)