Merge branch 'master' into reddit-stats

This commit is contained in:
Matthew Esposito 2023-06-09 17:31:12 -04:00 committed by GitHub
commit a39bb9d502
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 409 additions and 367 deletions

View file

@ -131,6 +131,8 @@ impl InstanceInfo {
["Disable stats collection", &convert(&self.config.disable_stats_collection)],
["Reddit request count", &self.reddit_requests.load(SeqCst).to_string()],
["Total request count", &self.total_requests.load(SeqCst).to_string()],
["Pushshift frontend", &convert(&self.config.pushshift)],
//TODO: fallback to crate::config::DEFAULT_PUSHSHIFT_FRONTEND
])
.with_header_row(["Settings"]),
);
@ -167,6 +169,7 @@ impl InstanceInfo {
Disable stats collection: {:?}\n
Reddit request count: {}\n
Total request count: {}\n
Pushshift frontend: {:?}\n
Config:\n
Banner: {:?}\n
Hide awards: {:?}\n
@ -190,6 +193,7 @@ impl InstanceInfo {
self.config.disable_stats_collection,
self.reddit_requests.load(SeqCst),
self.total_requests.load(SeqCst),
self.config.pushshift,
self.config.banner,
self.config.default_hide_awards,
self.config.default_theme,