Skip to content

fix for GET /cache API #754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 10, 2024
Merged

fix for GET /cache API #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a18205
fix for GET /cache API
nikhilsinhaparseable Apr 10, 2024
d29d373
fixed P_INGESTOR_URL fetch from env variables
nikhilsinhaparseable Apr 10, 2024
fe350f3
removed unnecessary else from server url func
nikhilsinhaparseable Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions server/src/handlers/http/modal/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,7 @@ impl Server {
web::put()
.to(logstream::put_enable_cache)
.authorize_for_stream(Action::PutCacheEnabled),
),
)
.service(
web::resource("/cache")
)
// GET "/logstream/{logstream}/cache" ==> Get retention for given logstream
.route(
web::get()
Expand Down
17 changes: 10 additions & 7 deletions server/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,14 +237,17 @@ pub fn get_address() -> SocketAddr {

let mut hostname = addr_from_env[0].to_string();
let mut port = addr_from_env[1].to_string();
if hostname.starts_with('$') && port.starts_with('$') {
hostname = get_from_env("HOSTNAME");
port = get_from_env("PORT");
let addr = format!("{}:{}", hostname, port);
addr.parse::<SocketAddr>().unwrap()
} else {
CONFIG.parseable.ingestor_url.parse::<SocketAddr>().unwrap()
if hostname.starts_with('$') {
let var_hostname = hostname[1..].to_string();
hostname = get_from_env(&var_hostname);
}
if port.starts_with('$') {
let var_port = port[1..].to_string();
port = get_from_env(&var_port);
}
format!("{}:{}", hostname, port)
.parse::<SocketAddr>()
.unwrap()
}
}
fn get_from_env(var_to_fetch: &str) -> String {
Expand Down