From 34009d2a3ae59f88d79a68b46f1ae4884bbc157c Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Sun, 7 Jul 2019 19:36:47 -0700
Subject: [PATCH] update pvasr

---
 src/ioc/PVAServerRegister.cpp | 18 +++++++++++-------
 src/server/serverContext.cpp  | 29 +++++++++++++----------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/ioc/PVAServerRegister.cpp b/src/ioc/PVAServerRegister.cpp
index fbee91f..39c0c2d 100644
--- a/src/ioc/PVAServerRegister.cpp
+++ b/src/ioc/PVAServerRegister.cpp
@@ -91,15 +91,19 @@ void stopPVAServer()
 void pvasr(int lvl)
 {
     try {
-        pvd::Lock G(the_server_lock);
-        if(!the_server) {
-            std::cout<<"PVA server not running\n";
-            return;
-        } else {
-            the_server->printInfo(lvl);
+        pva::ServerContext::shared_pointer serv;
+        {
+            pvd::Lock G(the_server_lock);
+            serv = the_server;
         }
+        if(!serv) {
+            std::cout<<"PVA server not running\n";
+        } else {
+            serv->printInfo(lvl);
+        }
+        std::cout.flush();
     }catch(std::exception& e){
-        std::cout<<"Error: "<<e.what()<<"\n";
+        std::cout<<"Error: "<<e.what()<<std::endl;
     }
 }
 
diff --git a/src/server/serverContext.cpp b/src/server/serverContext.cpp
index bad7609..ffdc3c2 100644
--- a/src/server/serverContext.cpp
+++ b/src/server/serverContext.cpp
@@ -369,22 +369,19 @@ void ServerContextImpl::printInfo(ostream& str, int lvl)
 {
     if(lvl==0) {
         Lock guard(_mutex);
-        str << "VERSION : " << getVersion().getVersionString() << endl
-            << "PROVIDER_NAMES : ";
-        for(std::vector<ChannelProvider::shared_pointer>::const_iterator it = _channelProviders.begin();
-            it != _channelProviders.end(); ++it)
-        {
-            str<<(*it)->getProviderName()<<", ";
-        }
-        str << endl
-            << "BEACON_ADDR_LIST : " << _beaconAddressList << endl
-            << "AUTO_BEACON_ADDR_LIST : " << _autoBeaconAddressList << endl
-            << "BEACON_PERIOD : " << _beaconPeriod << endl
-            << "BROADCAST_PORT : " << _broadcastPort << endl
-            << "SERVER_PORT : " << _serverPort << endl
-            << "RCV_BUFFER_SIZE : " << _receiveBufferSize << endl
-            << "IGNORE_ADDR_LIST: " << _ignoreAddressList << endl
-            << "INTF_ADDR_LIST : " << inetAddressToString(_ifaceAddr, false) << endl;
+        str << getVersion().getVersionString() << "\n"
+            << "Active configuration (w/ defaults)\n";
+
+        Configuration::shared_pointer conf(getCurrentConfig());
+#define SHOW(ENV) str << #ENV " = "<<conf->getPropertyAsString(#ENV, std::string())<<"\n";
+        SHOW(EPICS_PVAS_INTF_ADDR_LIST)
+        SHOW(EPICS_PVAS_BEACON_ADDR_LIST)
+        SHOW(EPICS_PVAS_AUTO_BEACON_ADDR_LIST)
+        SHOW(EPICS_PVAS_BEACON_PERIOD)
+        SHOW(EPICS_PVAS_BROADCAST_PORT)
+        SHOW(EPICS_PVAS_SERVER_PORT)
+        SHOW(EPICS_PVAS_PROVIDER_NAMES)
+#undef SHOW
 
     } else {
         // lvl >= 1