diff --git a/box.js b/box.js index 7a3986f8f..5072daae1 100755 --- a/box.js +++ b/box.js @@ -46,8 +46,7 @@ async function main() { const [error] = await safe(startServers()); if (error) return exitSync({ error: new Error(`Error starting server: ${JSON.stringify(error)}`), code: 1 }); - // require those here so that logging handler is already setup - require('supererror'); + // require this here so that logging handler is already setup const debug = require('debug')('box:box'); process.on('SIGINT', async function () { diff --git a/package-lock.json b/package-lock.json index 804efacdd..a0111644d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,7 +56,6 @@ "speakeasy": "^2.0.0", "split": "^1.0.1", "superagent": "^7.0.1", - "supererror": "^0.7.2", "tar-fs": "github:cloudron-io/tar-fs#ignore_stat_error", "tar-stream": "^2.2.0", "tldjs": "^2.3.1", @@ -5952,35 +5951,6 @@ "node": ">= 6" } }, - "node_modules/supererror": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/supererror/-/supererror-0.7.2.tgz", - "integrity": "sha512-eMrdX2uNcTW74XwOBUHnEwv+ZF5BCGqCpTxrcYN60oiUttF3wFBayhya5tTsYIOWKm9RpEkfWaYkVxq38oDL5w==", - "hasShrinkwrap": true, - "dependencies": { - "colors": "^1.2.1", - "prettyjson": "^1.2.1" - } - }, - "node_modules/supererror/node_modules/colors": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz", - "integrity": "sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==" - }, - "node_modules/supererror/node_modules/minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, - "node_modules/supererror/node_modules/prettyjson": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz", - "integrity": "sha1-/P+rQdGcq0365eV15kJGYZsS0ok=", - "dependencies": { - "colors": "1.2.1", - "minimist": "1.2.0" - } - }, "node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -11431,36 +11401,6 @@ } } }, - "supererror": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/supererror/-/supererror-0.7.2.tgz", - "integrity": "sha512-eMrdX2uNcTW74XwOBUHnEwv+ZF5BCGqCpTxrcYN60oiUttF3wFBayhya5tTsYIOWKm9RpEkfWaYkVxq38oDL5w==", - "requires": { - "colors": "^1.2.1", - "prettyjson": "^1.2.1" - }, - "dependencies": { - "colors": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz", - "integrity": "sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==" - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, - "prettyjson": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz", - "integrity": "sha1-/P+rQdGcq0365eV15kJGYZsS0ok=", - "requires": { - "colors": "1.2.1", - "minimist": "1.2.0" - } - } - } - }, "supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", diff --git a/package.json b/package.json index 22f07889e..cc86dface 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,6 @@ "speakeasy": "^2.0.0", "split": "^1.0.1", "superagent": "^7.0.1", - "supererror": "^0.7.2", "tar-fs": "github:cloudron-io/tar-fs#ignore_stat_error", "tar-stream": "^2.2.0", "tldjs": "^2.3.1", diff --git a/src/users.js b/src/users.js index ceb3119f7..b4faef128 100644 --- a/src/users.js +++ b/src/users.js @@ -686,7 +686,7 @@ async function notifyLoginLocation(user, ip, userAgent, auditSource) { if (constants.TEST && ip === '127.0.0.1') return; const response = await superagent.get('https://geolocation.cloudron.io/json').query({ ip }).ok(() => true); - if (response.statusCode !== 200) return console.error(`Failed to get geoip info. statusCode: ${response.statusCode}`); + if (response.statusCode !== 200) return debug(`Failed to get geoip info. statusCode: ${response.statusCode}`); const country = safe.query(response.body, 'country.names.en', ''); const city = safe.query(response.body, 'city.names.en', '');