Skip to content

Restore old behavior to only call geo init with a geopath #13025

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

Open
cmcfarlen wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

Restore old behavior to only call geo init with a geopath #13025

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions plugins/header_rewrite/header_rewrite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,17 +705,17 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf ATS_UNUSE
}
}

if (!geoDBpath.empty() && !geoDBpath.starts_with('/')) {
geoDBpath = std::string(TSConfigDirGet()) + '/' + geoDBpath;
}

if (!geoDBpath.empty()) {
if (!geoDBpath.starts_with('/')) {
geoDBpath = std::string(TSConfigDirGet()) + '/' + geoDBpath;
}
Dbg(pi_dbg_ctl, "Remap geo db %s", geoDBpath.c_str());
}

// Always initialize the plugin factory, even if no geo DB is specified. This
// is needed for run-plugin to work with relative paths.
std::call_once(initHRWLibs, [&geoDBpath]() { initHRWLibraries(geoDBpath); });
// This MUST be called only if the geoDBpath is set. If called without a geoDBPath (i.e. outside of this if) then
// NO hrw remap rule can load a mmdb file.
// The call_once applies to every remap instance as its a plugin global
std::call_once(initHRWLibs, [&geoDBpath]() { initHRWLibraries(geoDBpath); });
}

auto *conf = new RulesConfig(timezone, inboundIpSource);

Expand Down