Allow forcing of host country code query (#3319)

Jürgen Knödlseder
1 parent e943ca09
Showing 4 changed files with 8 additions and 6 deletions
include/GTools.hpp
pyext/GTools.i
src/support/GDaemon.cpp
src/support/GTools.cpp
@@ -164,7 +164,7 @@ namespace gammalib {
                                      const double& tol);
     std::string              http_query(const std::string& host,
                                         const std::string& query);
-    std::string              host_country(void);
+    std::string              host_country(const bool& force_query = false);
     GFilename                gamma_filename(const std::string& name);
 }
@@ -117,6 +117,6 @@ namespace gammalib {
                                      const double& tol);
     std::string              http_query(const std::string& host,
                                         const std::string& query);
-    std::string              host_country(void);
+    std::string              host_country(const bool& force_query = false);
     GFilename                gamma_filename(const std::string& name);
 }
@@ -679,8 +679,8 @@ void GDaemon::update_statistics(void)
  ***************************************************************************/
 void GDaemon::update_host_country(void)
 {
-    // Get host country code
-    std::string country = gammalib::host_country();
+    // Get host country code by forcing a query
+    std::string country = gammalib::host_country(true);
     // Continue only if host country is a two-digit code
     if (country.length() == 2) {
@@ -2259,6 +2259,7 @@ std::string gammalib::http_query(const std::string&amp; host, const std::string&amp; que
 /***********************************************************************//**
  * @brief Return two-digit host country code
  *
+ * @param[in] force_query Force query of host country code?
  * @return Host two-digit host country code.
  *
  * Returns two-digit host country code, either by reading the code from the
@@ -2278,6 +2279,7 @@ std::string gammalib::http_query(const std::string&amp; host, const std::string&amp; que
 /***********************************************************************//**
  * @brief Return two-digit host country code
  *
+ * @param[in] force_query Force query of host country code?
  * @return Host two-digit host country code.
  *
  * Returns two-digit host country code, either by reading the code from the
@@ -2294,7 +2296,7 @@ std::string gammalib::http_query(const std::string&amp; host, const std::string&amp; que
  * country code it will write the results into a host-country file.
  ***************************************************************************/
 #endif
-std::string gammalib::host_country(void)
+std::string gammalib::host_country(const bool& force_query)
 {
     // Initialise country as static variable
     static std::string country;
@@ -2306,7 +2308,7 @@ std::string gammalib::host_country(void)
         GFilename filename = gammalib::gamma_filename("host-country");
         // Continue only if file exists
-        if (access(filename.url().c_str(), R_OK) == 0) {
+        if ((!force_query) && (access(filename.url().c_str(), R_OK) == 0)) {
             // OpenMP critical zone to read host-country file
             #pragma omp critical(GammaLib_host_country)