Skip to content

Commit 173f88b

Browse files
committed
sqlite cleanup
1 parent 44573bc commit 173f88b

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

util/sqliteS3.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ exports.preRequest = async function(event) {
5353
db = new sqlite3.Database(sqliteFilePath);
5454
dataVersion = await getDataVersion();
5555
await setEtag(response.ETag);
56-
console.log('etag prerequest: ' + await getEtag());
5756
}
5857
else {
5958
// @TODO: if it doesn't exist, behave like it's a new site?
@@ -62,7 +61,6 @@ exports.preRequest = async function(event) {
6261
}
6362
catch (err) {
6463
if (err.$metadata && err.$metadata.httpStatusCode === 304) {
65-
console.log('Database is already up-to-date (ETag matched)');
6664
// No need to download, just use existing file
6765
db = new sqlite3.Database(sqliteFilePath);
6866
dataVersion = await getDataVersion();
@@ -83,12 +81,9 @@ exports.postRequest = async function(event, response) {
8381
if (!db) {
8482
db = new sqlite3.Database(sqliteFilePath);
8583
}
86-
console.log('Data version: ' + dataVersion);
8784
let versionNow = await getDataVersion();
88-
console.log('Version now: ' + versionNow);
8985

9086
// See if the db has been mutated, if so, send the changes to s3
91-
9287
if (dataVersion !== versionNow) {
9388
const dbExists = await exists(sqliteFilePath);
9489
if (dbExists) {
@@ -97,7 +92,6 @@ exports.postRequest = async function(event, response) {
9792

9893
const sqliteContent = await fs.readFile(sqliteFilePath);
9994
let currentEtag = await getEtag();
100-
console.log('etag postrequest: ' + currentEtag);
10195

10296
let putCommandParams = {
10397
Bucket: _config.bucket,
@@ -120,7 +114,7 @@ exports.postRequest = async function(event, response) {
120114
//@TODO: more descriptive message
121115
return {
122116
statusCode: 500,
123-
body: 'Database error'
117+
body: 'Database error. This can happen when simultaneous database updates happen. Re-try your request.'
124118
}
125119
}
126120
}

0 commit comments

Comments
 (0)