]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - SHUTTLE/AliShuttleConfig.cxx
memory consumption measures only memory used by preprocessor
[u/mrichter/AliRoot.git] / SHUTTLE / AliShuttleConfig.cxx
index d62135105601f1f33510a52d1684c82e0db48605..be77a0299d4db7b87632a6f8f069f3e0c1df03c3 100644 (file)
 
 /*
 $Log$
+Revision 1.27  2007/12/17 03:23:32  jgrosseo
+several bugfixes
+added "empty preprocessor" as placeholder for Acorde in FDR
+
+Revision 1.26  2007/12/07 19:14:36  acolla
+in AliShuttleTrigger:
+
+Added automatic collection of new runs on a regular time basis (settable from the configuration)
+
+in AliShuttleConfig: new members
+
+- triggerWait: time to wait for DIM trigger (s) before starting automatic collection of new runs
+- mode: run mode (test, prod) -> used to build log folder (logs or logs_PROD)
+
+in AliShuttle:
+
+- logs now stored in logs/#RUN/DET_#RUN.log
+
 Revision 1.25  2007/11/26 16:58:37  acolla
 Monalisa configuration added: host and table name
 
@@ -157,7 +175,7 @@ some docs added
 // will be retrieved (used by AliShuttle).
 //
 
-
+#include <Riostream.h>
 #include "AliShuttleConfig.h"
 #include "AliShuttleInterface.h"
 
@@ -168,6 +186,7 @@ some docs added
 #include <TLDAPResult.h>
 #include <TLDAPEntry.h>
 #include <TLDAPAttribute.h>
+#include <TKey.h>
 
 
 AliShuttleConfig::AliShuttleDCSConfigHolder::AliShuttleDCSConfigHolder(const TLDAPEntry* entry):
@@ -244,10 +263,136 @@ fIsValid(kFALSE)
                ExpandAndAdd(fDCSDataPoints, aDataPoint);
                }
        }
-
+       
        fIsValid = kTRUE;
 }
 
+//______________________________________________________________________________________________
+AliShuttleConfig::AliShuttleConfig(const AliShuttleConfig & other):
+       TObject(),
+       fConfigHost(other.fConfigHost),
+       fAlienPath(other.fAlienPath),
+       fDAQlbHost(other.fDAQlbHost),
+       fDAQlbPort(other.fDAQlbPort),
+       fDAQlbUser(other.fDAQlbUser),
+       fDAQlbPass(other.fDAQlbPass),
+       fDAQlbDB(other.fDAQlbDB),
+       fDAQlbTable(other.fDAQlbTable),
+       fShuttlelbTable(other.fShuttlelbTable),
+       fRunTypelbTable(other.fRunTypelbTable),
+       fPasswdFilePath(other.fPasswdFilePath),
+       fMaxRetries(other.fMaxRetries),
+       fPPTimeOut(other.fPPTimeOut),
+       fDCSTimeOut(other.fDCSTimeOut),
+       fDCSRetries(other.fDCSRetries),
+       fPPMaxMem(other.fPPMaxMem),
+       fMonitorHost(other.fMonitorHost),
+       fMonitorTable(other.fMonitorTable),
+       fTriggerWait(other.fTriggerWait),
+       fRunMode(other.fRunMode),
+       fDetectorMap(),
+       fDetectorList(other.fDetectorList),
+       fShuttleInstanceHost(other.fShuttleInstanceHost),
+       fProcessedDetectors(other.fProcessedDetectors),
+       fKeepDCSMap(other.fKeepDCSMap),
+       fKeepTempFolder(other.fKeepTempFolder),
+       fSendMail(other.fSendMail),
+       fProcessAll(other.fProcessAll),
+       fIsValid(other.fIsValid)
+{
+       //
+       // copy ctor
+       //
+       for (Int_t i = 0; i<3; i++){
+               fFXSHost[i]=other.fFXSHost[i];
+               fFXSPort[i]=other.fFXSPort[i];
+               fFXSUser[i]=other.fFXSUser[i];
+               fFXSPass[i]=other.fFXSPass[i];
+               fFXSBaseFolder[i]=other.fFXSBaseFolder[i];
+               fFXSdbHost[i]=other.fFXSdbHost[i];
+               fFXSdbPort[i]=other.fFXSdbPort[i];
+               fFXSdbUser[i]=other.fFXSdbUser[i];
+               fFXSdbPass[i]=other.fFXSdbPass[i];
+               fFXSdbName[i]=other.fFXSdbName[i];
+               fFXSdbTable[i]=other.fFXSdbTable[i];
+       }
+       for (Int_t i = 0; i<5; i++){
+               fAdmin[i] = new TObjArray();
+               fAdmin[i]->AddAt(other.fAdmin[i]->At(i),i);
+       }
+
+       TIter iter((other.fDetectorMap).GetTable());
+       TPair* aPair = 0;
+       
+       while ((aPair = (TPair*) iter.Next())) {
+               AliShuttleDetConfigHolder *holder =(AliShuttleDetConfigHolder *)aPair->Value();
+               TKey *key = (TKey*)aPair->Key();
+               fDetectorMap.Add(key,holder);
+       }
+
+
+} 
+//_____________________________________________________________________________________________                
+AliShuttleConfig& AliShuttleConfig::operator=(const AliShuttleConfig &other) 
+{
+       //
+       //assignment operator
+       //
+       this->fConfigHost=other.fConfigHost;
+       this->fDAQlbHost=other.fDAQlbHost;
+       this->fDAQlbPort=other.fDAQlbPort;
+       this->fDAQlbUser=other.fDAQlbUser;
+       this->fDAQlbPass=other.fDAQlbPass;
+       this->fDAQlbDB=other.fDAQlbDB;
+       this->fDAQlbTable=other.fDAQlbTable;
+       this->fShuttlelbTable=other.fShuttlelbTable;
+       this->fRunTypelbTable=other.fRunTypelbTable;
+       this->fPasswdFilePath=other.fPasswdFilePath;
+       this->fMaxRetries=other.fMaxRetries;
+       this->fPPTimeOut=other.fPPTimeOut;
+       this->fDCSTimeOut=other.fDCSTimeOut;
+       this->fDCSRetries=other.fDCSRetries;
+       this->fPPMaxMem=other.fPPMaxMem;
+       this->fMonitorHost=other.fMonitorHost;
+       this->fMonitorTable=other.fMonitorTable;
+       this->fTriggerWait=other.fTriggerWait;
+       this->fRunMode=other.fRunMode;
+       this->fDetectorList=other.fDetectorList;
+       this->fShuttleInstanceHost=other.fShuttleInstanceHost;
+       this->fProcessedDetectors=other.fProcessedDetectors;
+       this->fKeepDCSMap=other.fKeepDCSMap;
+       this->fKeepTempFolder=other.fKeepTempFolder;
+       this->fSendMail=other.fSendMail;
+       this->fProcessAll=other.fProcessAll;
+       this->fIsValid=other.fIsValid;
+       for (Int_t i = 0; i<3; i++){
+               this->fFXSHost[i]=other.fFXSHost[i];
+               this->fFXSPort[i]=other.fFXSPort[i];
+               this->fFXSUser[i]=other.fFXSUser[i];
+               this->fFXSPass[i]=other.fFXSPass[i];
+               this->fFXSBaseFolder[i]=other.fFXSBaseFolder[i];
+               this->fFXSdbHost[i]=other.fFXSdbHost[i];
+               this->fFXSdbPort[i]=other.fFXSdbPort[i];
+               this->fFXSdbUser[i]=other.fFXSdbUser[i];
+               this->fFXSdbPass[i]=other.fFXSdbPass[i];
+               this->fFXSdbName[i]=other.fFXSdbName[i];
+               this->fFXSdbTable[i]=other.fFXSdbTable[i];
+       }
+       for (Int_t i = 0; i<5; i++){
+               this->fAdmin[i] = new TObjArray();
+               this->fAdmin[i]->AddAt(other.fAdmin[i]->At(i),i);
+       }
+
+       TIter iter((other.fDetectorMap).GetTable());
+       TPair* aPair = 0;
+       
+       while ((aPair = (TPair*) iter.Next())) {
+               AliShuttleDetConfigHolder *holder =(AliShuttleDetConfigHolder *)aPair->Value();
+               TKey *key = (TKey*)aPair->Key();
+               this->fDetectorMap.Add(key,holder);
+       }
+       return *this;
+} 
 //______________________________________________________________________________________________
 void AliShuttleConfig::AliShuttleDCSConfigHolder::ExpandAndAdd(TObjArray* target, const char* entry)
 {
@@ -509,6 +654,7 @@ ClassImp(AliShuttleConfig)
 AliShuttleConfig::AliShuttleConfig(const char* host, Int_t port,
        const char* binddn, const char* password, const char* basedn):
        fConfigHost(host), 
+       fAlienPath(""), 
        fDAQlbHost(""), 
        fDAQlbPort(), 
        fDAQlbUser(""), 
@@ -517,8 +663,11 @@ AliShuttleConfig::AliShuttleConfig(const char* host, Int_t port,
        fDAQlbTable(""), 
        fShuttlelbTable(""), 
        fRunTypelbTable(""),
+       fPasswdFilePath(""),
        fMaxRetries(0), 
        fPPTimeOut(0), 
+       fDCSTimeOut(0), 
+       fDCSRetries(0), 
        fPPMaxMem(0), 
        fMonitorHost(""), 
        fMonitorTable(""), 
@@ -526,10 +675,15 @@ AliShuttleConfig::AliShuttleConfig(const char* host, Int_t port,
        fRunMode(kTest),
        fDetectorMap(), 
        fDetectorList(),
+       fAdmin(),
        fShuttleInstanceHost(""), 
        fProcessedDetectors(), 
+       fKeepDCSMap(kFALSE),
+       fKeepTempFolder(kFALSE),
+       fSendMail(kFALSE),
        fProcessAll(kFALSE), 
        fIsValid(kFALSE)
+
 {
        //
        // host: ldap server host
@@ -542,6 +696,12 @@ AliShuttleConfig::AliShuttleConfig(const char* host, Int_t port,
        fDetectorMap.SetOwner(1);
        fDetectorList.SetOwner(0); //fDetectorList and fDetectorMap share the same object!
        fProcessedDetectors.SetOwner();
+       
+       for (int i=0; i<5; i++)
+       {
+               fAdmin[i] = new TObjArray(); 
+               fAdmin[i]->SetOwner();
+       }
 
        TLDAPServer aServer(host, port, binddn, password, 3);
 
@@ -611,6 +771,7 @@ AliShuttleConfig::AliShuttleConfig(const char* host, Int_t port,
        
        result += SetGlobalConfig(&globalList);
        result += SetSysConfig(&sysList);
+       result += SetPasswords();
        result += SetDetConfig(&detList,&dcsList);
        result += SetHostConfig(&hostList);
        
@@ -815,6 +976,18 @@ const TObjArray* AliShuttleConfig::GetResponsibles(const char* detector) const
        return aHolder->GetResponsibles();
 }
 
+//______________________________________________________________________________________________
+const TObjArray* AliShuttleConfig::GetAdmins(Int_t sys) const
+{
+       //
+       // returns collection of TObjString which represents the list of mail addresses
+       // of the system's administrator(s) (DAQ, DCS, HLT, Global, Amanda)
+       //
+
+       if (sys < 0 || sys > 4) return 0;
+       return fAdmin[sys];
+}
+
 //______________________________________________________________________________________________
 Bool_t AliShuttleConfig::HostProcessDetector(const char* detector) const
 {
@@ -850,6 +1023,7 @@ UInt_t AliShuttleConfig::SetGlobalConfig(TList* list)
 {
        // Set the global configuration (DAQ Logbook + preprocessor monitoring settings)
 
+
        TLDAPEntry* anEntry = 0;
        TLDAPAttribute* anAttribute = 0;
        
@@ -873,6 +1047,13 @@ UInt_t AliShuttleConfig::SetGlobalConfig(TList* list)
        } 
        
        
+       anAttribute = anEntry->GetAttribute("AlienPath");
+       if (!anAttribute) {
+               AliError("Can't find AlienPath attribute!");
+               return 4;
+       }
+       fAlienPath = anAttribute->GetValue();
+
        anAttribute = anEntry->GetAttribute("daqLbHost");
        if (!anAttribute) {
                AliError("Can't find daqLbHost attribute!");
@@ -895,13 +1076,6 @@ UInt_t AliShuttleConfig::SetGlobalConfig(TList* list)
        }
        fDAQlbUser = anAttribute->GetValue();
 
-       anAttribute = anEntry->GetAttribute("daqLbPasswd");
-       if (!anAttribute) {
-               AliError("Can't find daqLbPasswd attribute!");
-               return 4;
-       }
-       fDAQlbPass = anAttribute->GetValue();
-
        anAttribute = anEntry->GetAttribute("daqLbDB");
        if (!anAttribute) {
                AliError("Can't find daqLbDB attribute!");
@@ -946,6 +1120,22 @@ UInt_t AliShuttleConfig::SetGlobalConfig(TList* list)
        tmpStr = anAttribute->GetValue();
        fPPTimeOut = tmpStr.Atoi();
 
+       anAttribute = anEntry->GetAttribute("dcsTimeOut");
+       if (!anAttribute) {
+               AliError("Can't find dcsTimeOut attribute!");
+               return 4;
+       }
+       tmpStr = anAttribute->GetValue();
+       fDCSTimeOut = tmpStr.Atoi();
+
+       anAttribute = anEntry->GetAttribute("nDCSretries");
+       if (!anAttribute) {
+               AliError("Can't find dcsTimeOut attribute!");
+               return 4;
+       }
+       tmpStr = anAttribute->GetValue();
+       fDCSRetries = tmpStr.Atoi();
+
        anAttribute = anEntry->GetAttribute("ppMaxMem");
        if (!anAttribute) {
                AliError("Can't find ppMaxMem attribute!");
@@ -978,28 +1168,106 @@ UInt_t AliShuttleConfig::SetGlobalConfig(TList* list)
        anAttribute = anEntry->GetAttribute("mode");
        if (!anAttribute) {
                AliWarning("Run mode not set! Running in test mode.");
+       } else {
+         tmpStr = anAttribute->GetValue();
+         if (tmpStr == "test")
+         {
+           fRunMode = kTest;
+         } else if (tmpStr == "prod") {
+           fRunMode = kProd;
+         } else {
+           AliWarning(Form("Not a valid run mode: %s", tmpStr.Data()));                
+           AliWarning("Valid run modes are \"test\" and \"prod\". Running in test mode.");
+         }
        }
-       tmpStr = anAttribute->GetValue();
-       if (tmpStr == "test")
+
+       anAttribute = anEntry->GetAttribute("keepDCSMap"); // MAY
+        if (!anAttribute)
        {
-               fRunMode = kTest;
-       } else if (tmpStr == "prod") {
-               fRunMode = kProd;
-       } else {
-               AliWarning(Form("Not a valid run mode: %s", tmpStr.Data()));            
-               AliWarning("Valid run modes are \"test\" and \"prod\". Running in test mode.");
+               AliWarning("keepDCSMap flag not set - default is FALSE");
+        } else {
+               TString keepDCSMapStr = anAttribute->GetValue();
+               if (!(keepDCSMapStr == "0" || keepDCSMapStr == "1"))
+               {
+                       AliError("keepDCSMap flag must be 0 or 1!");
+                       return 4;
+               }
+               fKeepDCSMap = (Bool_t) keepDCSMapStr.Atoi();
        }
-               
-       return 0;
        
+       anAttribute = anEntry->GetAttribute("keepTempFolder"); // MAY
+        if (!anAttribute)
+       {
+               AliWarning("keepTempFolder flag not set - default is FALSE");
+        } else {
+               TString keepTempFolderStr = anAttribute->GetValue();
+               if (!(keepTempFolderStr == "0" || keepTempFolderStr == "1"))
+               {
+                       AliError("keepTempFolder flag must be 0 or 1!");
+                       return 4;
+               }
+               fKeepTempFolder = (Bool_t) keepTempFolderStr.Atoi();
+       }
        
+
+       anAttribute = anEntry->GetAttribute("shuttleAdmin"); // MAY
+        if (!anAttribute)
+       {
+               AliDebug(2, "Warning! No \"shuttleAdmin\" attribute!");
+        }
+       else
+       {
+               const char* anAdmin;
+               while ((anAdmin = anAttribute->GetValue()))
+               {
+                       fAdmin[kGlobal]->AddLast(new TObjString(anAdmin));
+               }
+       }
+
+       anAttribute = anEntry->GetAttribute("amandaAdmin"); // MAY
+        if (!anAttribute)
+       {
+               AliDebug(2, "Warning! No \"amandaAdmin\" attribute!");
+        }
+       else
+       {
+               const char* anAdmin;
+               while ((anAdmin = anAttribute->GetValue()))
+               {
+                       fAdmin[kAmanda]->AddLast(new TObjString(anAdmin));
+               }
+       }
+       
+       anAttribute = anEntry->GetAttribute("sendMail"); // MAY
+        if (!anAttribute)
+       {
+               AliWarning("sendMail flag not set - default is FALSE");
+        } else {
+               TString sendMailStr = anAttribute->GetValue();
+               if (!(sendMailStr == "0" || sendMailStr == "1"))
+               {
+                       AliError("sendMail flag must be 0 or 1!");
+                       return 4;
+               }
+               fSendMail = (Bool_t) sendMailStr.Atoi();
+       }
+                                               
+       anAttribute = anEntry->GetAttribute("passwdFilePath");
+       if (!anAttribute) {
+               AliError("Can't find Passwords File Path attribute!");
+               return 4;
+       }
+       fPasswdFilePath = anAttribute->GetValue();
+
+       return 0;
 }
 
 //______________________________________________________________________________________________
 UInt_t AliShuttleConfig::SetSysConfig(TList* list)
 {
        // Set the online FXS configuration (DAQ + DCS + HLT)
-       
+
+
        TLDAPEntry* anEntry = 0;
        TLDAPAttribute* anAttribute = 0;
        
@@ -1010,7 +1278,9 @@ UInt_t AliShuttleConfig::SetSysConfig(TList* list)
        } 
 
        TIter iter(list);
-       Int_t iSys=0, count = 0;
+       Int_t count = 0;
+       SystemCode iSys=kDAQ;
+       
        while ((anEntry = dynamic_cast<TLDAPEntry*> (iter.Next())))
        {
                anAttribute = anEntry->GetAttribute("system");
@@ -1018,17 +1288,17 @@ UInt_t AliShuttleConfig::SetSysConfig(TList* list)
                
                if (sysName == "DAQ") 
                {
-                       iSys = 0;
+                       iSys = kDAQ;
                        count += 1;
                }
                else if (sysName == "DCS")
                {
-                       iSys = 1;
+                       iSys = kDCS;
                        count += 10;
                }
                else if (sysName == "HLT")
                {
-                       iSys = 2;
+                       iSys = kHLT;
                        count += 100;
                }
                
@@ -1056,14 +1326,6 @@ UInt_t AliShuttleConfig::SetSysConfig(TList* list)
                }
                fFXSdbUser[iSys] = anAttribute->GetValue();
 
-               anAttribute = anEntry->GetAttribute("dbPasswd");
-               if (!anAttribute) {
-                       AliError(Form ("Can't find dbPasswd attribute for %s!!",
-                                               AliShuttleInterface::GetSystemName(iSys)));
-                       return 5;
-               }
-               fFXSdbPass[iSys] = anAttribute->GetValue();
-
                anAttribute = anEntry->GetAttribute("dbName");
                if (!anAttribute) {
                        AliError(Form ("Can't find dbName attribute for %s!!",
@@ -1106,6 +1368,24 @@ UInt_t AliShuttleConfig::SetSysConfig(TList* list)
 
                anAttribute = anEntry->GetAttribute("fxsPasswd");
                if (anAttribute) fFXSPass[iSys] = anAttribute->GetValue();
+
+               anAttribute = anEntry->GetAttribute("fxsBaseFolder");
+               if (anAttribute) fFXSBaseFolder[iSys] = anAttribute->GetValue();
+       
+               anAttribute = anEntry->GetAttribute("fxsAdmin"); // MAY
+               if (!anAttribute)
+               {
+                       AliDebug(2, "Warning! No \"fxsAdmin\" attribute!");
+               }
+               else
+               {
+                       const char* anAdmin;
+                       while ((anAdmin = anAttribute->GetValue()))
+                       {
+                               fAdmin[iSys]->AddLast(new TObjString(anAdmin));
+                       }
+               }
+       
        }
        
        if(count != 111) {
@@ -1116,6 +1396,67 @@ UInt_t AliShuttleConfig::SetSysConfig(TList* list)
        return 0;
 }
 
+//______________________________________________________________________________________________
+UInt_t AliShuttleConfig::SetPasswords(){
+       
+       AliInfo("Setting Passwords");
+
+       // Retrieving Passwords for DAQ lb, DAQ/DCS/HLT FXS
+
+       ifstream *inputfile = new ifstream(fPasswdFilePath.Data());
+       if (!*inputfile) {
+               AliError(Form("Error opening file %s !", fPasswdFilePath.Data()));
+               inputfile->close();
+               delete inputfile;
+               return 1;
+       }
+
+       TString line;
+       Int_t nPwd=0;
+       Int_t nPwdFake=0;
+       while (line.ReadLine(*inputfile)) {
+               TObjArray *tokens = line.Tokenize(" \t");
+               TString system = ((TObjString *)tokens->At(0))->String(); 
+               TString password = ((TObjString *)tokens->At(1))->String();
+               if (system.Contains("DAQ_LB")){
+                       fDAQlbPass=password;
+                       nPwd++;
+                       AliDebug(3,Form("DAQ_LB: Password %s for %s found", password.Data(), system.Data()));
+               }
+               else if (system.Contains("DAQ_DB")){
+                       fFXSdbPass[0]=password;
+                       nPwd++;
+                       AliDebug(3,Form("DAQ_DB: Password %s for %s found", password.Data(), system.Data()));
+               }
+               else if (system.Contains("DCS_DB")){
+                       fFXSdbPass[1]=password;
+                       nPwd++;
+                       AliDebug(3,Form("DCS_DB: Password %s for %s found", password.Data(), system.Data()));
+               }
+               else if (system.Contains("HLT_DB")){
+                       fFXSdbPass[2]=password;
+                       nPwd++;
+                       AliDebug(3,Form("HLT_DB: Password %s for %s found", password.Data(), system.Data()));
+               }
+               else {
+                       nPwdFake++;
+                       AliDebug(3,Form("%i fake line(s) found in file %s", nPwdFake, fPasswdFilePath.Data()));
+                       continue;
+               }
+               delete tokens;
+       }
+
+       inputfile->close();
+       delete inputfile;
+
+       if (nPwd!=4){
+               AliError(Form("Wrong file for DAQ Logbook password found %s (some passwors missing), please Check!", fPasswdFilePath.Data()));
+               return 2;
+       }
+
+       return 0;
+
+}
 //______________________________________________________________________________________________
 UInt_t AliShuttleConfig::SetDetConfig(TList* detList, TList* dcsList)
 {
@@ -1229,9 +1570,35 @@ void AliShuttleConfig::Print(Option_t* option) const
                result += "\n";
        }
 
-       result += Form("PP time out = %d - max PP mem size = %d KB - max retries = %d "
-                      "- DIM trigger waiting timeout = %d\n\n", 
-                               fPPTimeOut, fPPMaxMem, fMaxRetries, fTriggerWait);
+       result += Form("PP time out = %d - DCS time out = %d - max PP mem size = %d KB - max retries = %d "
+                      "- DIM trigger waiting timeout = %d\n", 
+                               fPPTimeOut, fDCSTimeOut, fPPMaxMem, fMaxRetries, fTriggerWait);
+       result += Form("FLAGS: keepDCSMap = %d - keepTempFolder = %d - SendMail = %d \n", 
+                               fKeepDCSMap, fKeepTempFolder, fSendMail);
+       const TObjArray* shuttleAdmins = GetAdmins(kGlobal);
+       if (shuttleAdmins->GetEntries() != 0)
+       {
+               result += "SHUTTLE administrator(s): ";
+               TIter it(shuttleAdmins);
+               TObjString* anAdmin;
+               while ((anAdmin = (TObjString*) it.Next()))
+               {
+                       result += Form("%s ", anAdmin->String().Data());
+               }
+               result += "\n";
+       }
+       const TObjArray* amandaAdmins = GetAdmins(kAmanda);
+       if (amandaAdmins->GetEntries() != 0)
+       {
+               result += "Amanda server administrator(s): ";
+               TIter it(amandaAdmins);
+               TObjString* anAdmin;
+               while ((anAdmin = (TObjString*) it.Next()))
+               {
+                       result += Form("%s ", anAdmin->String().Data());
+               }
+               result += "\n\n";
+       }
        result += "------------------------------------------------------\n";
 
        result += Form("Logbook Configuration \n\n \tHost: %s:%d; \tUser: %s; ",
@@ -1243,7 +1610,7 @@ void AliShuttleConfig::Print(Option_t* option) const
                fDAQlbDB.Data(), fDAQlbTable.Data(), fShuttlelbTable.Data(), fRunTypelbTable.Data());
 
        result += "\n\n";
-
+       
        result += "------------------------------------------------------\n";
        result += "FXS configuration\n\n";
 
@@ -1253,9 +1620,21 @@ void AliShuttleConfig::Print(Option_t* option) const
                                                fFXSdbHost[iSys].Data(), fFXSdbPort[iSys], fFXSdbUser[iSys].Data(),
                                                fFXSdbName[iSys].Data(), fFXSdbTable[iSys].Data());
                // result += Form("DB Password:",fFXSdbPass[iSys].Data());
-               result += Form("\tFXS host: %s:%d; \tUser: %s\n\n", fFXSHost[iSys].Data(), fFXSPort[iSys],
+               result += Form("\tFXS host: %s:%d; \tUser: %s\n", fFXSHost[iSys].Data(), fFXSPort[iSys],
                                                fFXSUser[iSys].Data());
                // result += Form("FXS Password:",fFXSPass[iSys].Data());
+               const TObjArray* fxsAdmins = GetAdmins(iSys);
+               if (fxsAdmins->GetEntries() != 0)
+               {
+                       result += "\tAdministrator(s): ";
+                       TIter it(fxsAdmins);
+                       TObjString* anAdmin;
+                       while ((anAdmin = (TObjString*) it.Next()))
+                       {
+                               result += Form("%s ", anAdmin->String().Data());
+                       }
+                       result += "\n\n";
+               }
        }
 
        result += "------------------------------------------------------\n";
@@ -1265,7 +1644,7 @@ void AliShuttleConfig::Print(Option_t* option) const
                fMonitorHost.Data(), fMonitorTable.Data());
                
        result += "\n\n";
-       
+               
        TString optStr(option);
 
        result += "------------------------------------------------------\n";