iridium/redsunlib
iridium/redsunlib
2
2
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 4 Wiki Activity

Add package name to instance_info in order to identify redlib instances

Browse Source
This commit is contained in:
Matthew Esposito 2023-12-28 11:21:56 -05:00
parent 1316c8491c
commit 28f39329ad
No known key found for this signature in database
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/instance_info.rs
View File

@ -85,6 +85,7 @@ fn info_html(req: Request<Body>) -> Result<Response<Body>, Error> {
} }
#[derive(Serialize, Deserialize, Default)] #[derive(Serialize, Deserialize, Default)]
pub(crate) struct InstanceInfo { pub(crate) struct InstanceInfo {
package_name: String,
crate_version: String, crate_version: String,
git_commit: String, git_commit: String,
deploy_date: String, deploy_date: String,
@ -98,6 +99,7 @@ pub(crate) struct InstanceInfo {
impl InstanceInfo { impl InstanceInfo {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
package_name: env!("CARGO_PKG_NAME").to_string(),
crate_version: env!("CARGO_PKG_VERSION").to_string(), crate_version: env!("CARGO_PKG_VERSION").to_string(),
git_commit: env!("GIT_HASH").to_string(), git_commit: env!("GIT_HASH").to_string(),
deploy_date: OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc()).to_string(), deploy_date: OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc()).to_string(),
@ -122,6 +124,7 @@ impl InstanceInfo {
} }
container.add_table( container.add_table(
Table::from([ Table::from([
["Package name", &self.package_name],
["Crate version", &self.crate_version], ["Crate version", &self.crate_version],
["Git commit", &self.git_commit], ["Git commit", &self.git_commit],
["Deploy date", &self.deploy_date], ["Deploy date", &self.deploy_date],
@ -161,7 +164,8 @@ impl InstanceInfo {
match string_type { match string_type {
StringType::Raw => { StringType::Raw => {
format!( format!(
"Crate version: {}\n "Package name: {}\n
Crate version: {}\n
Git commit: {}\n Git commit: {}\n
Deploy date: {}\n Deploy date: {}\n
Deploy timestamp: {}\n Deploy timestamp: {}\n
@ -186,6 +190,7 @@ impl InstanceInfo {
Default use HLS: {:?}\n Default use HLS: {:?}\n
Default hide HLS notification: {:?}\n Default hide HLS notification: {:?}\n
Default subscriptions: {:?}\n", Default subscriptions: {:?}\n",
self.package_name,
self.crate_version, self.crate_version,
self.git_commit, self.git_commit,
self.deploy_date, self.deploy_date,