Page MenuHomePhabricator
Differential D8865

[reports-service] Add basic config
ClosedPublic
Actions

Authored by bartek on Aug 18 2023, 12:18 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 1, 8:12 AM
Unknown Object (File)
Fri, Mar 28, 8:06 AM
Unknown Object (File)
Tue, Mar 25, 2:03 PM
Unknown Object (File)
Tue, Mar 25, 7:14 AM
Unknown Object (File)
Tue, Mar 25, 7:14 AM
Unknown Object (File)
Tue, Mar 25, 7:14 AM
Unknown Object (File)
Tue, Mar 25, 7:14 AM
Unknown Object (File)
Mon, Mar 24, 11:21 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
michal
• jon
Commits
rCOMMc14102964eec: [reports-service] Add basic config
Summary

Added standard config for localstack, logging and listening port for reports service, the same way as we do for other services.

Depends on D8864

Test Plan

cargo run, checked if cli args and localstack environment variable work

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.Aug 18 2023, 12:18 AM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptAug 18 2023, 12:18 AM
Harbormaster completed remote builds in B21884: Diff 30062.Aug 18 2023, 12:35 AM
bartek published this revision for review.Aug 18 2023, 6:53 AM
• jon accepted this revision.Aug 18 2023, 1:06 PM
• jon added inline comments.
services/reports/src/config.rs
18–28 ↗(On Diff #30062)

As time goes on, I feel like this is anti-pattern. It's just convenient to have a global CONFIG which you can fetch anywhere some setting out of thin air. But really, I think we should just be parsing this in main and passing the respective configuration values to the part of the code which cares about them.

For example:

let cmd_args = config::AppConfig::parse()?;
let aws_config = config::load_aws_config(cmd_args.localstack_endpoint);
start_webserver(cmd_args.http_port, &aws_config);

Since this is already an established norm, I'm not going to block on it though.

This revision is now accepted and ready to land.Aug 18 2023, 1:06 PM
michal accepted this revision.Aug 21 2023, 12:51 AM

I agree with @jon, this was slightly confusing to me at the beginning when I started working on the services.

bartek updated this revision to Diff 30297.Aug 25 2023, 1:02 AM

Rebase

bartek added a child revision: D8937: [report-service] Add report types structs.Aug 25 2023, 1:07 AM
Harbormaster completed remote builds in B22072: Diff 30297.Aug 25 2023, 1:19 AM
bartek added a child revision: D8947: [reports-service] Add HTTP server.Aug 25 2023, 4:20 AM
bartek mentioned this in D8959: [blob-service] Remove gRPC service, change default port.Aug 26 2023, 12:43 AM
bartek added a child revision: D8978: [reports-service] Introduce emails config.Aug 28 2023, 6:27 AM
Closed by commit rCOMMc14102964eec: [reports-service] Add basic config (authored by bartek). · Explain WhyAug 28 2023, 7:45 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMMc14102964eec: [reports-service] Add basic config.

Revision Contents
Changeset List

PathSize
services/
comm-services-lib/
src/
blob/
3 lines
reports/
11 lines
src/
53 lines
26 lines

Diff 30439

View Options

services/comm-services-lib/src/blob/client.rs

Show First 20 Lines • Show All 153 Lines • ▼ Show 20 Lines
class RemoveAllMessagesOperation : public MessageStoreOperationBase { class RemoveAllMessagesOperation : public MessageStoreOperationBase {
public: public:
virtual void execute() override { virtual void execute() override {
DatabaseManager::getQueryExecutor().removeAllMessages(); DatabaseManager::getQueryExecutor().removeAllMessages();
DatabaseManager::getQueryExecutor().removeAllMedia(); DatabaseManager::getQueryExecutor().removeAllMedia();
} }
}; };
class ReplaceMessageThreadsOperation : public MessageStoreOperationBase {
public:
ReplaceMessageThreadsOperation(jsi::Runtime &rt, const jsi::Object &payload)
: msg_threads{} {
auto threads = payload.getProperty(rt, "threads").asObject(rt).asArray(rt);
for (size_t idx = 0; idx < threads.size(rt); idx++) {
auto thread = threads.getValueAtIndex(rt, idx).asObject(rt);
auto thread_id = thread.getProperty(rt, "id").asString(rt).utf8(rt);
auto start_reached = std::stoi(
thread.getProperty(rt, "start_reached").asString(rt).utf8(rt));
auto last_navigated_to = std::stoll(
thread.getProperty(rt, "last_navigated_to").asString(rt).utf8(rt));
auto last_pruned = std::stoll(
thread.getProperty(rt, "last_pruned").asString(rt).utf8(rt));
MessageStoreThread msg_thread = MessageStoreThread{
thread_id, start_reached, last_navigated_to, last_pruned};
this->msg_threads.push_back(msg_thread);
}
}
virtual void execute() override {
DatabaseManager::getQueryExecutor().replaceMessageStoreThreads(
this->msg_threads);
}
private:
std::vector<MessageStoreThread> msg_threads;
};
class RemoveAllMessageStoreThreadsOperation : public MessageStoreOperationBase {
public:
virtual void execute() override {
DatabaseManager::getQueryExecutor().removeAllMessageStoreThreads();
}
};
class RemoveMessageStoreThreadsOperation : public MessageStoreOperationBase {
public:
RemoveMessageStoreThreadsOperation(
jsi::Runtime &rt,
const jsi::Object &payload)
: thread_ids{} {
auto payload_ids = payload.getProperty(rt, "ids").asObject(rt).asArray(rt);
for (size_t idx = 0; idx < payload_ids.size(rt); idx++) {
this->thread_ids.push_back(
payload_ids.getValueAtIndex(rt, idx).asString(rt).utf8(rt));
}
}
virtual void execute() override {
DatabaseManager::getQueryExecutor().removeMessageStoreThreads(
this->thread_ids);
}
private:
std::vector<std::string> thread_ids;
};
} // namespace comm } // namespace comm
View Options

services/reports/Cargo.lock

Show First 20 Lines • Show All 153 Lines • ▼ Show 20 Lines
class RemoveAllMessagesOperation : public MessageStoreOperationBase { class RemoveAllMessagesOperation : public MessageStoreOperationBase {
public: public:
virtual void execute() override { virtual void execute() override {
DatabaseManager::getQueryExecutor().removeAllMessages(); DatabaseManager::getQueryExecutor().removeAllMessages();
DatabaseManager::getQueryExecutor().removeAllMedia(); DatabaseManager::getQueryExecutor().removeAllMedia();
} }
}; };
class ReplaceMessageThreadsOperation : public MessageStoreOperationBase {
public:
ReplaceMessageThreadsOperation(jsi::Runtime &rt, const jsi::Object &payload)
: msg_threads{} {
auto threads = payload.getProperty(rt, "threads").asObject(rt).asArray(rt);
for (size_t idx = 0; idx < threads.size(rt); idx++) {
auto thread = threads.getValueAtIndex(rt, idx).asObject(rt);
auto thread_id = thread.getProperty(rt, "id").asString(rt).utf8(rt);
auto start_reached = std::stoi(
thread.getProperty(rt, "start_reached").asString(rt).utf8(rt));
auto last_navigated_to = std::stoll(
thread.getProperty(rt, "last_navigated_to").asString(rt).utf8(rt));
auto last_pruned = std::stoll(
thread.getProperty(rt, "last_pruned").asString(rt).utf8(rt));
MessageStoreThread msg_thread = MessageStoreThread{
thread_id, start_reached, last_navigated_to, last_pruned};
this->msg_threads.push_back(msg_thread);
}
}
virtual void execute() override {
DatabaseManager::getQueryExecutor().replaceMessageStoreThreads(
this->msg_threads);
}
private:
std::vector<MessageStoreThread> msg_threads;
};
class RemoveAllMessageStoreThreadsOperation : public MessageStoreOperationBase {
public:
virtual void execute() override {
DatabaseManager::getQueryExecutor().removeAllMessageStoreThreads();
}
};
class RemoveMessageStoreThreadsOperation : public MessageStoreOperationBase {
public:
RemoveMessageStoreThreadsOperation(
jsi::Runtime &rt,
const jsi::Object &payload)
: thread_ids{} {
auto payload_ids = payload.getProperty(rt, "ids").asObject(rt).asArray(rt);
for (size_t idx = 0; idx < payload_ids.size(rt); idx++) {
this->thread_ids.push_back(
payload_ids.getValueAtIndex(rt, idx).asString(rt).utf8(rt));
}
}
virtual void execute() override {
DatabaseManager::getQueryExecutor().removeMessageStoreThreads(
this->thread_ids);
}
private:
std::vector<std::string> thread_ids;
};
} // namespace comm } // namespace comm
View Options

services/reports/Cargo.toml

Show First 20 Lines • Show All 153 Lines • ▼ Show 20 Lines
class RemoveAllMessagesOperation : public MessageStoreOperationBase { class RemoveAllMessagesOperation : public MessageStoreOperationBase {
public: public:
virtual void execute() override { virtual void execute() override {
DatabaseManager::getQueryExecutor().removeAllMessages(); DatabaseManager::getQueryExecutor().removeAllMessages();
DatabaseManager::getQueryExecutor().removeAllMedia(); DatabaseManager::getQueryExecutor().removeAllMedia();
} }
}; };
class ReplaceMessageThreadsOperation : public MessageStoreOperationBase {
public:
ReplaceMessageThreadsOperation(jsi::Runtime &rt, const jsi::Object &payload)
: msg_threads{} {
auto threads = payload.getProperty(rt, "threads").asObject(rt).asArray(rt);
for (size_t idx = 0; idx < threads.size(rt); idx++) {
auto thread = threads.getValueAtIndex(rt, idx).asObject(rt);
auto thread_id = thread.getProperty(rt, "id").asString(rt).utf8(rt);
auto start_reached = std::stoi(
thread.getProperty(rt, "start_reached").asString(rt).utf8(rt));
auto last_navigated_to = std::stoll(
thread.getProperty(rt, "last_navigated_to").asString(rt).utf8(rt));
auto last_pruned = std::stoll(
thread.getProperty(rt, "last_pruned").asString(rt).utf8(rt));
MessageStoreThread msg_thread = MessageStoreThread{
thread_id, start_reached, last_navigated_to, last_pruned};
this->msg_threads.push_back(msg_thread);
}
}
virtual void execute() override {
DatabaseManager::getQueryExecutor().replaceMessageStoreThreads(
this->msg_threads);
}
private:
std::vector<MessageStoreThread> msg_threads;
};
class RemoveAllMessageStoreThreadsOperation : public MessageStoreOperationBase {
public:
virtual void execute() override {
DatabaseManager::getQueryExecutor().removeAllMessageStoreThreads();
}
};
class RemoveMessageStoreThreadsOperation : public MessageStoreOperationBase {
public:
RemoveMessageStoreThreadsOperation(
jsi::Runtime &rt,
const jsi::Object &payload)
: thread_ids{} {
auto payload_ids = payload.getProperty(rt, "ids").asObject(rt).asArray(rt);
for (size_t idx = 0; idx < payload_ids.size(rt); idx++) {
this->thread_ids.push_back(
payload_ids.getValueAtIndex(rt, idx).asString(rt).utf8(rt));
}
}
virtual void execute() override {
DatabaseManager::getQueryExecutor().removeMessageStoreThreads(
this->thread_ids);
}
private:
std::vector<std::string> thread_ids;
};
} // namespace comm } // namespace comm
View Options

services/reports/src/config.rs

Show First 20 Lines • Show All 153 Lines • ▼ Show 20 Lines
class RemoveAllMessagesOperation : public MessageStoreOperationBase { class RemoveAllMessagesOperation : public MessageStoreOperationBase {
public: public:
virtual void execute() override { virtual void execute() override {
DatabaseManager::getQueryExecutor().removeAllMessages(); DatabaseManager::getQueryExecutor().removeAllMessages();
DatabaseManager::getQueryExecutor().removeAllMedia(); DatabaseManager::getQueryExecutor().removeAllMedia();
} }
}; };
class ReplaceMessageThreadsOperation : public MessageStoreOperationBase {
public:
ReplaceMessageThreadsOperation(jsi::Runtime &rt, const jsi::Object &payload)
: msg_threads{} {
auto threads = payload.getProperty(rt, "threads").asObject(rt).asArray(rt);
for (size_t idx = 0; idx < threads.size(rt); idx++) {
auto thread = threads.getValueAtIndex(rt, idx).asObject(rt);
auto thread_id = thread.getProperty(rt, "id").asString(rt).utf8(rt);
auto start_reached = std::stoi(
thread.getProperty(rt, "start_reached").asString(rt).utf8(rt));
auto last_navigated_to = std::stoll(
thread.getProperty(rt, "last_navigated_to").asString(rt).utf8(rt));
auto last_pruned = std::stoll(
thread.getProperty(rt, "last_pruned").asString(rt).utf8(rt));
MessageStoreThread msg_thread = MessageStoreThread{
thread_id, start_reached, last_navigated_to, last_pruned};
this->msg_threads.push_back(msg_thread);
}
}
virtual void execute() override {
DatabaseManager::getQueryExecutor().replaceMessageStoreThreads(
this->msg_threads);
}
private:
std::vector<MessageStoreThread> msg_threads;
};
class RemoveAllMessageStoreThreadsOperation : public MessageStoreOperationBase {
public:
virtual void execute() override {
DatabaseManager::getQueryExecutor().removeAllMessageStoreThreads();
}
};
class RemoveMessageStoreThreadsOperation : public MessageStoreOperationBase {
public:
RemoveMessageStoreThreadsOperation(
jsi::Runtime &rt,
const jsi::Object &payload)
: thread_ids{} {
auto payload_ids = payload.getProperty(rt, "ids").asObject(rt).asArray(rt);
for (size_t idx = 0; idx < payload_ids.size(rt); idx++) {
this->thread_ids.push_back(
payload_ids.getValueAtIndex(rt, idx).asString(rt).utf8(rt));
}
}
virtual void execute() override {
DatabaseManager::getQueryExecutor().removeMessageStoreThreads(
this->thread_ids);
}
private:
std::vector<std::string> thread_ids;
};
} // namespace comm } // namespace comm
View Options

services/reports/src/main.rs

Loading...