Page MenuHomePhabricator
Differential D4804

[services] Tunnelbroker - Update Cargo dependencies with the Log crate
ClosedPublic
Actions

Authored by • max on Aug 11 2022, 3:52 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 21, 1:05 AM
Unknown Object (File)
Wed, Mar 19, 9:55 PM
Unknown Object (File)
Wed, Mar 19, 7:29 PM
Unknown Object (File)
Wed, Mar 19, 7:29 PM
Unknown Object (File)
Sun, Mar 16, 12:08 AM
Unknown Object (File)
Fri, Mar 14, 2:25 PM
Unknown Object (File)
Mar 4 2025, 5:13 AM
Unknown Object (File)
Mar 4 2025, 5:13 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
• karol
tomek

Details

Reviewers
• karol
varun
tomek
• jon
ashoat
Commits
rCOMM7fcdf68bed17: [services] Tunnelbroker - Update Cargo dependencies with the Log crate
Summary

This small diff introduces updating Cargo dependencies with the Log crate to use logging in the Rust library.

Related Linear task: ENG-1330

Test Plan

Successfully run cargo build inside the services/tunnelbroker/rust-notifications folder.

Diff Detail

Repository
rCOMM Comm
Branch
add-log-to-cargo-dependencies
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• max created this revision.Aug 11 2022, 3:52 AM
• max held this revision as a draft.
Herald added subscribers: • abosh, • karol, atul and 3 others. · View Herald TranscriptAug 11 2022, 3:52 AM
• max updated this revision to Diff 15544.Aug 11 2022, 3:54 AM

Append Cargo.lock file

• max added a parent revision: D4803: [services] Tunnelbroker - Update Cargo dependencies with the CXX.Aug 11 2022, 3:54 AM
Harbormaster completed remote builds in B11294: Diff 15543.Aug 11 2022, 4:02 AM
Harbormaster completed remote builds in B11295: Diff 15544.Aug 11 2022, 4:04 AM
• max added a child revision: D4807: [services] Tunnelbroker - Update CMakeLists and Cargo build with the CXX integration updates.Aug 11 2022, 4:16 AM
• max published this revision for review.Aug 11 2022, 4:23 AM
• max edited the summary of this revision. (Show Details)
• max edited the test plan for this revision. (Show Details)
• max added reviewers: • karol, varun, tomek.
• max added a reviewer: • jon.
tomek accepted this revision.Aug 11 2022, 5:02 AM
tomek added a reviewer: ashoat.
ashoat accepted this revision.Aug 11 2022, 6:17 AM
This revision is now accepted and ready to land.Aug 11 2022, 6:17 AM
Closed by commit rCOMM7fcdf68bed17: [services] Tunnelbroker - Update Cargo dependencies with the Log crate (authored by • max). · Explain WhyAug 16 2022, 3:02 AM
This revision was automatically updated to reflect the committed changes.
• max added a commit: rCOMM7fcdf68bed17: [services] Tunnelbroker - Update Cargo dependencies with the Log crate.
• max removed a child revision: D4807: [services] Tunnelbroker - Update CMakeLists and Cargo build with the CXX integration updates.Aug 18 2022, 8:21 AM

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
rust-notifications/
1 line

Diff 15544

View Options

services/tunnelbroker/rust-notifications/Cargo.lock

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/rust-notifications/Cargo.toml

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines