Skip to content

Commit 850490a

Browse files
author
James Fuqian
committed
update client browser db, code cleanup, use logger vs console log.
1 parent a1af112 commit 850490a

5 files changed

Lines changed: 19 additions & 27 deletions

File tree

client/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3224,9 +3224,9 @@ caniuse-api@^3.0.0:
32243224
lodash.uniq "^4.5.0"
32253225

32263226
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001181:
3227-
version "1.0.30001191"
3228-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz#bacb432b6701f690c8c5f7c680166b9a9f0843d9"
3229-
integrity sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw==
3227+
version "1.0.30001279"
3228+
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001279.tgz"
3229+
integrity sha512-VfEHpzHEXj6/CxggTwSFoZBBYGQfQv9Cf42KPlO79sWXCD1QNKWKsKzFeWL7QpZHJQYAvocqV6Rty1yJMkqWLQ==
32303230

32313231
capture-exit@^2.0.0:
32323232
version "2.0.0"

server/src/routes/Authorize.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import db from '../utils/db';
66
import { getAccessToken, generateAuthorizeUrl } from '../utils/bb2';
77
import { getBenefitData } from './Data';
88
import { getLoggedInUser } from 'src/utils/user';
9-
9+
import logger from '@shared/Logger';
1010

1111
export async function authorizationCallback(req: Request, res: Response) {
1212
try {
@@ -52,6 +52,7 @@ export async function authorizationCallback(req: Request, res: Response) {
5252
* to display or store the error
5353
*/
5454
console.log(e);
55+
logger.info(e)
5556
}
5657
/* DEVELOPER NOTE:
5758
* This is a hardcoded redirect, but this should be used from settings stored in a conf file

server/src/utils/call.ts

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import axios from 'axios';
22
import FormData from 'form-data';
33
import { try_later } from './queue';
44
import { is_retryable } from './retry';
5+
import logger from '@shared/Logger';
56

67
export async function endpointPost(endpoint_url: string, data: FormData, extra: any) {
78
return await httpCall({
@@ -25,42 +26,37 @@ export async function httpCall(config: any, retry_flag: boolean) {
2526
var resp = null
2627
try {
2728
resp = await axios(config);
28-
console.log("<<<<<<<<<<<<<<<<<<< RESPONSE:")
29-
console.log(resp.data);
30-
console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
29+
logger.info("RESPONSE:")
30+
logger.info(resp.data);
3131
} catch (error: any) {
3232
// DEVELOPER NOTES:
3333
// here handle errors per errors.readme.md
3434
if (error.response) {
35-
console.log("<<<<<<<<<<<<<<<<<<<<<< ERROR RESPONSE:")
36-
console.log(error.response.status)
37-
console.log(error.response.data)
35+
logger.info("ERROR RESPONSE:")
36+
logger.info(error.response.status)
37+
logger.info(error.response.data)
3838
resp = error.response
39-
console.log(">>>>>>>>>>>>>>>>>>>>>>>>")
4039
// DEVELOPER NOTES:
4140
// check for retryable (500) errors and enqueue it for retry
4241
if (retry_flag && is_retryable(error)) {
4342
try_later(error);
44-
console.log("Request failed and is retryable, saved for retry later.")
43+
logger.info("Request failed and is retryable, saved for retry later.")
4544
}
4645
}
4746
else if (error.request) {
4847
// something went wrong on sender side, not retryable
4948
// error.request is an instance of XMLHttpRequest in the browser and an instance of
5049
// http.ClientRequest in node.js
51-
console.log("<<<<<<<<<<<<<<<<<<<<<< ERROR REQUEST:")
52-
console.log(error.request);
53-
console.log(">>>>>>>>>>>>>>>>>>>>>>>>")
50+
logger.info("ERROR REQUEST:")
51+
logger.info(error.request);
5452
}
5553
else {
56-
console.log("<<<<<<<<<<<<<<<<<<<<<<<< OTHER ERRORS:")
57-
console.log('Error: [', error.message, ']');
58-
console.log(">>>>>>>>>>>>>>>>>>>>>>>>")
54+
logger.info("OTHER ERRORS:")
55+
logger.info('Error: [' + error.message + ']');
5956
}
6057
// dump axios config for diagnosis
61-
console.log("----------------- CONFIG:")
62-
console.log(error.config);
63-
console.log("-------------------------")
58+
logger.info("CONFIG:")
59+
logger.info(error.config);
6460
}
6561
return resp
6662
}

server/src/utils/queue.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export default class Retryables<T> implements IQueue<T> {
3131
const RetryableRequests = new Retryables<Retryable>();
3232

3333
export function try_later(item: any) {
34-
console.log("try_later() called: ", item)
3534
RetryableRequests.enQ(new Retryable(item, 3));
3635
}
3736

server/src/utils/retry.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as cron from 'node-cron'
22
import { do_retry } from './queue';
3+
import logger from '@shared/Logger';
34

45
// schedule cron job
56
export function schedule() {
@@ -40,22 +41,17 @@ export default class Retryable {
4041
// hard code back off by minutes
4142
var next_retry_time = new Date(this.created.getTime() + (60000 * (2 ** this.count)))
4243
var current_time = new Date()
43-
console.log("next retry at: ", next_retry_time, ", current time: ", current_time)
4444
is_ready = current_time > next_retry_time;
45-
console.log("is_ready: ", is_ready)
4645
}
4746
return is_ready;
4847
}
4948

5049
tried() {
51-
console.log("count=", this.count)
5250
this.count=this.count + 1;
53-
console.log("after count=", this.count)
5451
return !this.expired();
5552
}
5653

5754
expired() {
58-
console.log("expired ? max=", this.max, ", count=", this.count, " max = count? :", (this.max - this.count) === 0)
5955
return (this.max - this.count) === 0;
6056
}
6157
}

0 commit comments

Comments
 (0)