Page MenuHomePhabricator
Differential D8401

[Identity] Allow for setting logging levels through env
ClosedPublic
Actions

Authored by • jon on Jun 30 2023, 3:28 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 28, 9:13 AM
Unknown Object (File)
Sun, Mar 16, 11:36 PM
Unknown Object (File)
Tue, Mar 4, 12:50 PM
Unknown Object (File)
Tue, Mar 4, 12:50 PM
Unknown Object (File)
Tue, Mar 4, 12:50 PM
Unknown Object (File)
Tue, Mar 4, 12:50 PM
Unknown Object (File)
Tue, Mar 4, 12:50 PM
Unknown Object (File)
Tue, Mar 4, 12:49 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
varun
bartek
Commits
rCOMM57cf5dbdec07: [Identity] Allow for setting logging levels through env
Summary

Improve logging, previously only INFO and above
could be emitted. Now you can set debug with RUST_LOG=debug

Depends on D8400

Test Plan
cd services/identity
RUST_LOG=debug cargo run -- server

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• jon created this revision.Jun 30 2023, 3:28 PM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJun 30 2023, 3:28 PM
Harbormaster completed remote builds in B20661: Diff 28317.Jun 30 2023, 3:58 PM
• jon requested review of this revision.Jun 30 2023, 3:58 PM
bartek added inline comments.Jun 30 2023, 11:12 PM
services/identity/src/client_service.rs
100 ↗(On Diff #28317)

Nit, I see this cleaner without the blank line

429 ↗(On Diff #28317)
  • Isn't this "user_id and password"?
  • I don't know how sensitive data this is - It's debug-only log so I assume we don't display it in prod anyway, do we?
ashoat added inline comments.Jul 3 2023, 10:32 AM
services/identity/src/client_service.rs
429 ↗(On Diff #28317)

Even in debug, I think printing a password to the log isn't great...

Imagine somebody uses a real password of theirs in the dev environment. They would be surprised (in a bad way) if they see it printed to the screen

I think printing the username here is fine though

• jon edited parent revisions, added: D8400: [Keyserver] Apply DB Migrations; removed: D8399: [Keyserver/rust] Ignore debug version of napi build.Jul 6 2023, 9:16 AM
• jon added a child revision: D8402: [Identity] Fix opaque login.
• jon updated this revision to Diff 28445.Jul 6 2023, 10:17 AM
• jon marked 3 inline comments as done.
• jon added a parent revision: D8399: [Keyserver/rust] Ignore debug version of napi build.

Address feedback

• jon edited the summary of this revision. (Show Details)Jul 6 2023, 10:21 AM
• jon removed a parent revision: D8399: [Keyserver/rust] Ignore debug version of napi build.
Harbormaster completed remote builds in B20769: Diff 28445.Jul 6 2023, 10:34 AM
varun accepted this revision.Jul 6 2023, 10:56 AM
This revision is now accepted and ready to land.Jul 6 2023, 10:56 AM
bartek accepted this revision.Jul 6 2023, 11:20 PM
• jon updated this revision to Diff 28674.Jul 13 2023, 9:17 AM

Address feedback, fix parent diff

services/identity/src/client_service.rs
429 ↗(On Diff #28317)

oh sorry, I added this because of the regression in identity service (which had the error message "pakeRegistrationData not found"), I meant to remove it before doing arc diff

Harbormaster completed remote builds in B20920: Diff 28674.Jul 13 2023, 9:35 AM
• jon updated this revision to Diff 28712.Jul 16 2023, 7:13 PM

Rebase on master

This revision was landed with ongoing or failed builds.Jul 16 2023, 7:39 PM
Closed by commit rCOMM57cf5dbdec07: [Identity] Allow for setting logging levels through env (authored by • jon). · Explain Why
This revision was automatically updated to reflect the committed changes.
• jon added a commit: rCOMM57cf5dbdec07: [Identity] Allow for setting logging levels through env.
Harbormaster completed remote builds in B20956: Diff 28712.Jul 17 2023, 1:00 AM

Revision Contents
Changeset List

PathSize
services/
identity/
2 lines
src/
3 lines
11 lines

Diff 28674

View Options

services/identity/Cargo.lock

// @flow // @flow
import type { Account as OlmAccount } from '@commapp/olm';
import cluster from 'cluster'; import cluster from 'cluster';
import schedule from 'node-schedule'; import schedule from 'node-schedule';
import { backupDB } from './backups.js'; import { backupDB } from './backups.js';
import { createDailyUpdatesThread } from './daily-updates.js'; import { createDailyUpdatesThread } from './daily-updates.js';
import { updateAndReloadGeoipDB } from './update-geoip-db.js'; import { updateAndReloadGeoipDB } from './update-geoip-db.js';
import { updateIdentityReservedUsernames } from './update-identity-reserved-usernames.js'; import { updateIdentityReservedUsernames } from './update-identity-reserved-usernames.js';
import { deleteOrphanedActivity } from '../deleters/activity-deleters.js'; import { deleteOrphanedActivity } from '../deleters/activity-deleters.js';
Show All 9 Linesimport {
deleteOrphanedSessions, deleteOrphanedSessions,
deleteOldWebSessions, deleteOldWebSessions,
} from '../deleters/session-deleters.js'; } from '../deleters/session-deleters.js';
import { deleteStaleSIWENonceEntries } from '../deleters/siwe-nonce-deleters.js'; import { deleteStaleSIWENonceEntries } from '../deleters/siwe-nonce-deleters.js';
import { deleteInaccessibleThreads } from '../deleters/thread-deleters.js'; import { deleteInaccessibleThreads } from '../deleters/thread-deleters.js';
import { deleteExpiredUpdates } from '../deleters/update-deleters.js'; import { deleteExpiredUpdates } from '../deleters/update-deleters.js';
import { deleteUnassignedUploads } from '../deleters/upload-deleters.js'; import { deleteUnassignedUploads } from '../deleters/upload-deleters.js';
import { fetchCallUpdateOlmAccount } from '../updaters/olm-account-updater.js'; import { fetchCallUpdateOlmAccount } from '../updaters/olm-account-updater.js';
import { validateAccountPrekey } from '../utils/olm-utils.js'; import { validateAndUploadAccountPrekeys } from '../utils/olm-utils.js';
if (cluster.isMaster) { if (cluster.isMaster) {
schedule.scheduleJob( schedule.scheduleJob(
'30 3 * * *', // every day at 3:30 AM in the keyserver's timezone '30 3 * * *', // every day at 3:30 AM in the keyserver's timezone
async () => { async () => {
try { try {
// Do everything one at a time to reduce load since we're in no hurry, // Do everything one at a time to reduce load since we're in no hurry,
// and since some queries depend on previous ones. // and since some queries depend on previous ones.
▲ Show 20 Lines • Show All 69 Lines • ▼ Show 20 Lines async () => {
); );
} }
}, },
); );
schedule.scheduleJob( schedule.scheduleJob(
'0 0 * * *', // every day at midnight in the keyserver's timezone '0 0 * * *', // every day at midnight in the keyserver's timezone
async () => { async () => {
try { try {
await fetchCallUpdateOlmAccount('content', validateAccountPrekey); await fetchCallUpdateOlmAccount(
await fetchCallUpdateOlmAccount('notifications', validateAccountPrekey); 'content',
(contentAccount: OlmAccount) =>
fetchCallUpdateOlmAccount(
'notifications',
(notifAccount: OlmAccount) =>
validateAndUploadAccountPrekeys(contentAccount, notifAccount),
),
);
} catch (e) { } catch (e) {
console.warn('encountered error while trying to validate prekeys', e); console.warn('encountered error while trying to validate prekeys', e);
} }
}, },
); );
} }
View Options

services/identity/Cargo.toml

// @flow // @flow
import type { Account as OlmAccount } from '@commapp/olm';
import cluster from 'cluster'; import cluster from 'cluster';
import schedule from 'node-schedule'; import schedule from 'node-schedule';
import { backupDB } from './backups.js'; import { backupDB } from './backups.js';
import { createDailyUpdatesThread } from './daily-updates.js'; import { createDailyUpdatesThread } from './daily-updates.js';
import { updateAndReloadGeoipDB } from './update-geoip-db.js'; import { updateAndReloadGeoipDB } from './update-geoip-db.js';
import { updateIdentityReservedUsernames } from './update-identity-reserved-usernames.js'; import { updateIdentityReservedUsernames } from './update-identity-reserved-usernames.js';
import { deleteOrphanedActivity } from '../deleters/activity-deleters.js'; import { deleteOrphanedActivity } from '../deleters/activity-deleters.js';
Show All 9 Linesimport {
deleteOrphanedSessions, deleteOrphanedSessions,
deleteOldWebSessions, deleteOldWebSessions,
} from '../deleters/session-deleters.js'; } from '../deleters/session-deleters.js';
import { deleteStaleSIWENonceEntries } from '../deleters/siwe-nonce-deleters.js'; import { deleteStaleSIWENonceEntries } from '../deleters/siwe-nonce-deleters.js';
import { deleteInaccessibleThreads } from '../deleters/thread-deleters.js'; import { deleteInaccessibleThreads } from '../deleters/thread-deleters.js';
import { deleteExpiredUpdates } from '../deleters/update-deleters.js'; import { deleteExpiredUpdates } from '../deleters/update-deleters.js';
import { deleteUnassignedUploads } from '../deleters/upload-deleters.js'; import { deleteUnassignedUploads } from '../deleters/upload-deleters.js';
import { fetchCallUpdateOlmAccount } from '../updaters/olm-account-updater.js'; import { fetchCallUpdateOlmAccount } from '../updaters/olm-account-updater.js';
import { validateAccountPrekey } from '../utils/olm-utils.js'; import { validateAndUploadAccountPrekeys } from '../utils/olm-utils.js';
if (cluster.isMaster) { if (cluster.isMaster) {
schedule.scheduleJob( schedule.scheduleJob(
'30 3 * * *', // every day at 3:30 AM in the keyserver's timezone '30 3 * * *', // every day at 3:30 AM in the keyserver's timezone
async () => { async () => {
try { try {
// Do everything one at a time to reduce load since we're in no hurry, // Do everything one at a time to reduce load since we're in no hurry,
// and since some queries depend on previous ones. // and since some queries depend on previous ones.
▲ Show 20 Lines • Show All 69 Lines • ▼ Show 20 Lines async () => {
); );
} }
}, },
); );
schedule.scheduleJob( schedule.scheduleJob(
'0 0 * * *', // every day at midnight in the keyserver's timezone '0 0 * * *', // every day at midnight in the keyserver's timezone
async () => { async () => {
try { try {
await fetchCallUpdateOlmAccount('content', validateAccountPrekey); await fetchCallUpdateOlmAccount(
await fetchCallUpdateOlmAccount('notifications', validateAccountPrekey); 'content',
(contentAccount: OlmAccount) =>
fetchCallUpdateOlmAccount(
'notifications',
(notifAccount: OlmAccount) =>
validateAndUploadAccountPrekeys(contentAccount, notifAccount),
),
);
} catch (e) { } catch (e) {
console.warn('encountered error while trying to validate prekeys', e); console.warn('encountered error while trying to validate prekeys', e);
} }
}, },
); );
} }
View Options

services/identity/src/client_service.rs

// @flow // @flow
import type { Account as OlmAccount } from '@commapp/olm';
import cluster from 'cluster'; import cluster from 'cluster';
import schedule from 'node-schedule'; import schedule from 'node-schedule';
import { backupDB } from './backups.js'; import { backupDB } from './backups.js';
import { createDailyUpdatesThread } from './daily-updates.js'; import { createDailyUpdatesThread } from './daily-updates.js';
import { updateAndReloadGeoipDB } from './update-geoip-db.js'; import { updateAndReloadGeoipDB } from './update-geoip-db.js';
import { updateIdentityReservedUsernames } from './update-identity-reserved-usernames.js'; import { updateIdentityReservedUsernames } from './update-identity-reserved-usernames.js';
import { deleteOrphanedActivity } from '../deleters/activity-deleters.js'; import { deleteOrphanedActivity } from '../deleters/activity-deleters.js';
Show All 9 Linesimport {
deleteOrphanedSessions, deleteOrphanedSessions,
deleteOldWebSessions, deleteOldWebSessions,
} from '../deleters/session-deleters.js'; } from '../deleters/session-deleters.js';
import { deleteStaleSIWENonceEntries } from '../deleters/siwe-nonce-deleters.js'; import { deleteStaleSIWENonceEntries } from '../deleters/siwe-nonce-deleters.js';
import { deleteInaccessibleThreads } from '../deleters/thread-deleters.js'; import { deleteInaccessibleThreads } from '../deleters/thread-deleters.js';
import { deleteExpiredUpdates } from '../deleters/update-deleters.js'; import { deleteExpiredUpdates } from '../deleters/update-deleters.js';
import { deleteUnassignedUploads } from '../deleters/upload-deleters.js'; import { deleteUnassignedUploads } from '../deleters/upload-deleters.js';
import { fetchCallUpdateOlmAccount } from '../updaters/olm-account-updater.js'; import { fetchCallUpdateOlmAccount } from '../updaters/olm-account-updater.js';
import { validateAccountPrekey } from '../utils/olm-utils.js'; import { validateAndUploadAccountPrekeys } from '../utils/olm-utils.js';
if (cluster.isMaster) { if (cluster.isMaster) {
schedule.scheduleJob( schedule.scheduleJob(
'30 3 * * *', // every day at 3:30 AM in the keyserver's timezone '30 3 * * *', // every day at 3:30 AM in the keyserver's timezone
async () => { async () => {
try { try {
// Do everything one at a time to reduce load since we're in no hurry, // Do everything one at a time to reduce load since we're in no hurry,
// and since some queries depend on previous ones. // and since some queries depend on previous ones.
▲ Show 20 Lines • Show All 69 Lines • ▼ Show 20 Lines async () => {
); );
} }
}, },
); );
schedule.scheduleJob( schedule.scheduleJob(
'0 0 * * *', // every day at midnight in the keyserver's timezone '0 0 * * *', // every day at midnight in the keyserver's timezone
async () => { async () => {
try { try {
await fetchCallUpdateOlmAccount('content', validateAccountPrekey); await fetchCallUpdateOlmAccount(
await fetchCallUpdateOlmAccount('notifications', validateAccountPrekey); 'content',
(contentAccount: OlmAccount) =>
fetchCallUpdateOlmAccount(
'notifications',
(notifAccount: OlmAccount) =>
validateAndUploadAccountPrekeys(contentAccount, notifAccount),
),
);
} catch (e) { } catch (e) {
console.warn('encountered error while trying to validate prekeys', e); console.warn('encountered error while trying to validate prekeys', e);
} }
}, },
); );
} }
View Options

services/identity/src/main.rs

// @flow // @flow
import type { Account as OlmAccount } from '@commapp/olm';
import cluster from 'cluster'; import cluster from 'cluster';
import schedule from 'node-schedule'; import schedule from 'node-schedule';
import { backupDB } from './backups.js'; import { backupDB } from './backups.js';
import { createDailyUpdatesThread } from './daily-updates.js'; import { createDailyUpdatesThread } from './daily-updates.js';
import { updateAndReloadGeoipDB } from './update-geoip-db.js'; import { updateAndReloadGeoipDB } from './update-geoip-db.js';
import { updateIdentityReservedUsernames } from './update-identity-reserved-usernames.js'; import { updateIdentityReservedUsernames } from './update-identity-reserved-usernames.js';
import { deleteOrphanedActivity } from '../deleters/activity-deleters.js'; import { deleteOrphanedActivity } from '../deleters/activity-deleters.js';
Show All 9 Linesimport {
deleteOrphanedSessions, deleteOrphanedSessions,
deleteOldWebSessions, deleteOldWebSessions,
} from '../deleters/session-deleters.js'; } from '../deleters/session-deleters.js';
import { deleteStaleSIWENonceEntries } from '../deleters/siwe-nonce-deleters.js'; import { deleteStaleSIWENonceEntries } from '../deleters/siwe-nonce-deleters.js';
import { deleteInaccessibleThreads } from '../deleters/thread-deleters.js'; import { deleteInaccessibleThreads } from '../deleters/thread-deleters.js';
import { deleteExpiredUpdates } from '../deleters/update-deleters.js'; import { deleteExpiredUpdates } from '../deleters/update-deleters.js';
import { deleteUnassignedUploads } from '../deleters/upload-deleters.js'; import { deleteUnassignedUploads } from '../deleters/upload-deleters.js';
import { fetchCallUpdateOlmAccount } from '../updaters/olm-account-updater.js'; import { fetchCallUpdateOlmAccount } from '../updaters/olm-account-updater.js';
import { validateAccountPrekey } from '../utils/olm-utils.js'; import { validateAndUploadAccountPrekeys } from '../utils/olm-utils.js';
if (cluster.isMaster) { if (cluster.isMaster) {
schedule.scheduleJob( schedule.scheduleJob(
'30 3 * * *', // every day at 3:30 AM in the keyserver's timezone '30 3 * * *', // every day at 3:30 AM in the keyserver's timezone
async () => { async () => {
try { try {
// Do everything one at a time to reduce load since we're in no hurry, // Do everything one at a time to reduce load since we're in no hurry,
// and since some queries depend on previous ones. // and since some queries depend on previous ones.
▲ Show 20 Lines • Show All 69 Lines • ▼ Show 20 Lines async () => {
); );
} }
}, },
); );
schedule.scheduleJob( schedule.scheduleJob(
'0 0 * * *', // every day at midnight in the keyserver's timezone '0 0 * * *', // every day at midnight in the keyserver's timezone
async () => { async () => {
try { try {
await fetchCallUpdateOlmAccount('content', validateAccountPrekey); await fetchCallUpdateOlmAccount(
await fetchCallUpdateOlmAccount('notifications', validateAccountPrekey); 'content',
(contentAccount: OlmAccount) =>
fetchCallUpdateOlmAccount(
'notifications',
(notifAccount: OlmAccount) =>
validateAndUploadAccountPrekeys(contentAccount, notifAccount),
),
);
} catch (e) { } catch (e) {
console.warn('encountered error while trying to validate prekeys', e); console.warn('encountered error while trying to validate prekeys', e);
} }
}, },
); );
} }