From bb07675e2f76004d586516325c751869520921e0 Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Fri, 8 Dec 2017 16:17:10 +0100
Subject: [PATCH] [cta-frontend] Removes hard-coding of client username in
debug mode
---
cmdline/CtaAdminCmd.cpp | 12 +++++-------
xroot_ssi_pb/XrdSsiPbService.hpp | 6 ++++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cmdline/CtaAdminCmd.cpp b/cmdline/CtaAdminCmd.cpp
index 66064a98ae..57ea20489d 100644
--- a/cmdline/CtaAdminCmd.cpp
+++ b/cmdline/CtaAdminCmd.cpp
@@ -290,17 +290,15 @@ void CtaAdminCmd::throwUsage(const std::string &error_txt) const
{
// Command has been set: show command-specific help
- help << m_execname << ' ';
-
- // Reverse lookup of subcommand
+ // Reverse lookup of long command name
+ std::string longcmd;
for(auto map_it = cmdLookup.begin(); map_it != cmdLookup.end(); ++map_it) {
- if(admincmd == map_it->second) {
- help << map_it->first << ' ';
- break;
+ if(admincmd == map_it->second && map_it->first.length() > longcmd.length()) {
+ longcmd = map_it->first;
}
}
- help << cmdHelp.at(admincmd).help();
+ help << m_execname << ' ' << longcmd << cmdHelp.at(admincmd).help();
}
throw std::runtime_error(help.str());
diff --git a/xroot_ssi_pb/XrdSsiPbService.hpp b/xroot_ssi_pb/XrdSsiPbService.hpp
index ed9812d5b7..c3b6894c56 100644
--- a/xroot_ssi_pb/XrdSsiPbService.hpp
+++ b/xroot_ssi_pb/XrdSsiPbService.hpp
@@ -87,8 +87,6 @@ public:
<< (resource.rOpts & XrdSsiResource::Reusable ? "Resuable " : "")
<< (resource.rOpts & XrdSsiResource::Discard ? "Discard" : "")
<< std::endl;
-
- resource.client->name = "ctadev";
#endif
if(resource.client == nullptr || resource.client->name == nullptr)
{
@@ -97,6 +95,10 @@ public:
return false;
}
+#ifdef XRDSSI_DEBUG
+ std::cerr << "[DEBUG] Resource client name: " << resource.client->name << std::endl;
+#endif
+
return true;
}
--
GitLab