Monalisa configuration added: host and table name

diff --git a/SHUTTLE/AliShuttle.cxx b/SHUTTLE/AliShuttle.cxx
index 328ee009b5e162f779ea4bd07c2b1325ca94438d..5e80876b98264740d3170f6f73152b26136d38c8 100644 (file)
--- a/SHUTTLE/AliShuttle.cxx
+++ b/SHUTTLE/AliShuttle.cxx
@@ -15,6 +15,10 @@
 
 /*
 $Log$
+Revision 1.64  2007/11/13 16:15:47  acolla
+DCS map is stored in a file in the temp folder where the detector is processed.
+If the preprocessor fails, the temp folder is not removed. This will help the debugging of the problem.
+
 Revision 1.63  2007/11/02 10:53:16  acolla
 Protection added to AliShuttle::CopyFileLocally
 
@@ -1389,7 +1393,8 @@ Bool_t AliShuttle::Process(AliShuttleLogbookEntry* entry)
                                        GetCurrentRun()));
 
        // create ML instance that monitors this run
-       fMonaLisa = new TMonaLisaWriter(Form("%d", GetCurrentRun()), "SHUTTLE", "aliendb1.cern.ch");
+       fMonaLisa = new TMonaLisaWriter(Form("%d", GetCurrentRun()), fConfig->GetMonitorTable(),
+                                               fConfig->GetMonitorHost());
        // disable monitoring of other parameters that come e.g. from TFile
        gMonitoringWriter = 0;
 

diff --git a/SHUTTLE/AliShuttleConfig.cxx b/SHUTTLE/AliShuttleConfig.cxx
index 1e8233b8b6f99837166de9d2e91cc7a81f9fc518..46dfae951a040e3d63e94614d1aa4d4054cb0fab 100644 (file)
--- a/SHUTTLE/AliShuttleConfig.cxx
+++ b/SHUTTLE/AliShuttleConfig.cxx
@@ -15,6 +15,10 @@
 
 /*
 $Log$
+Revision 1.24  2007/10/24 10:44:08  acolla
+
+debug AliInfo removed
+
 Revision 1.23  2007/09/28 15:27:40  acolla
 
 AliDCSClient "multiSplit" option added in the DCS configuration
@@ -513,6 +517,8 @@ AliShuttleConfig::AliShuttleConfig(const char* host, Int_t port,
        fMaxRetries(0), 
        fPPTimeOut(0), 
        fPPMaxMem(0), 
+       fMonitorHost(""), 
+       fMonitorTable(""), 
        fDetectorMap(), 
        fDetectorList(),
        fShuttleInstanceHost(""), 
@@ -943,6 +949,20 @@ UInt_t AliShuttleConfig::SetGlobalConfig(TList* list)
        tmpStr = anAttribute->GetValue();
        fPPMaxMem = tmpStr.Atoi();
        
+       anAttribute = anEntry->GetAttribute("monitorHost");
+       if (!anAttribute) {
+               AliError("Can't find monitorHost attribute!");
+               return 4;
+       }
+       fMonitorHost = anAttribute->GetValue();
+       
+       anAttribute = anEntry->GetAttribute("monitorTable");
+       if (!anAttribute) {
+               AliError("Can't find monitorTable attribute!");
+               return 4;
+       }
+       fMonitorTable = anAttribute->GetValue();
+       
        return 0;
        
        
@@ -1187,7 +1207,7 @@ void AliShuttleConfig::Print(Option_t* option) const
 
 //     result += "Password: ";
 //     result.Append('*', fDAQlbPass.Length());
-       result += Form("\tDB: %s; \tTables: %s, %s, %s",
+       result += Form("\tDB: %s; \tTables: %s, %s, %s\n",
                fDAQlbDB.Data(), fDAQlbTable.Data(), fShuttlelbTable.Data(), fRunTypelbTable.Data());
 
        result += "\n\n";
@@ -1206,6 +1226,14 @@ void AliShuttleConfig::Print(Option_t* option) const
                // result += Form("FXS Password:",fFXSPass[iSys].Data());
        }
 
+       result += "------------------------------------------------------\n";
+       result += "MonaLisa configuration\n\n";
+       
+       result += Form("\tHost: %s; \tTable name: %s",
+               fMonitorHost.Data(), fMonitorTable.Data());
+               
+       result += "\n\n";
+       
        TString optStr(option);
 
        result += "------------------------------------------------------\n";

diff --git a/SHUTTLE/AliShuttleConfig.h b/SHUTTLE/AliShuttleConfig.h
index 7f0bf23771d0d5f2068c49b3d0c8f83d4e0fc0c1..44c20d4cbc124e0d00570c636b3796144e7aa17d 100644 (file)
--- a/SHUTTLE/AliShuttleConfig.h
+++ b/SHUTTLE/AliShuttleConfig.h
@@ -54,6 +54,9 @@ public:
 
        Int_t GetPPTimeOut() const { return fPPTimeOut; }
        Int_t GetPPMaxMem() const { return fPPMaxMem; }
+       
+       const char* GetMonitorHost() const {return fMonitorHost.Data();}
+       const char* GetMonitorTable() const {return fMonitorTable.Data();}
 
        const TObjArray* GetDetectors() const;
 
@@ -161,41 +164,44 @@ private:
        UInt_t SetDetConfig(TList* detList, TList* dcsList);
        UInt_t SetHostConfig(TList* hostList);
        
-       TString fConfigHost;            //! Host of the Shuttle configuration LDAP server
-
-       TString fDAQlbHost;             //! Host of the DAQ logbook MySQL Server
-       UInt_t  fDAQlbPort;             //! port of the DAQ logbook MySQL Server
-       TString fDAQlbUser;             //! username of the DAQ logbook MySQL Server
-       TString fDAQlbPass;             //! password of the DAQ logbook MySQL Server
-       TString fDAQlbDB;               //! DB name of the DAQ logbook MySQL Server
-       TString fDAQlbTable;            //! Table name of the DAQ logbook 
-       TString fShuttlelbTable;        //! Table name of the Shuttle logbook
-       TString fRunTypelbTable;        //! Table name of the Run typr logbook
-
-       TString fFXSHost[3];            //! Host of the [DAQ, DCS, HLT] File eXchange Server
-       UInt_t  fFXSPort[3];            //! Port of the [DAQ, DCS, HLT] File eXchange Server
-       TString fFXSUser[3];            //! username of the [DAQ, DCS, HLT] File eXchange Server
-       TString fFXSPass[3];            //! password of the [DAQ, DCS, HLT] File eXchange Server
-
-       TString fFXSdbHost[3];          //! Host of the [DAQ, DCS, HLT] FXS database
-       UInt_t  fFXSdbPort[3];          //! Port of the [DAQ, DCS, HLT] FXS database
-       TString fFXSdbUser[3];          //! username of the [DAQ, DCS, HLT] FXS database
-       TString fFXSdbPass[3];          //! password of the [DAQ, DCS, HLT] FXS database
-       TString fFXSdbName[3];          //! name of the [DAQ, DCS, HLT] FXS database
-       TString fFXSdbTable[3];         //! Table name of the [DAQ, DCS, HLT] FXS database
-
-       Int_t fMaxRetries;        // number of retries of a failed preprocessor
-
-       Int_t fPPTimeOut;         // timeout until a preprocessor is killed
-       Int_t fPPMaxMem;          // maximum allowed memory until a preprocessor is killed
-
-       TMap fDetectorMap;              //! Map of the detector-by-detector configuration
-       TObjArray fDetectorList;        //! List of detectors with valid configuration
-
-       TString fShuttleInstanceHost;   //! Instance of the SHUTTLE
-       TObjArray fProcessedDetectors;  //! list of the detector to be processed by this machine
-       Bool_t fProcessAll;             //! flag indicating that all detectors will be processed
-       Bool_t fIsValid;                //! flag for the validity of the configuration
+       TString fConfigHost;            // Host of the Shuttle configuration LDAP server
+
+       TString fDAQlbHost;             // Host of the DAQ logbook MySQL Server
+       UInt_t  fDAQlbPort;             // port of the DAQ logbook MySQL Server
+       TString fDAQlbUser;             // username of the DAQ logbook MySQL Server
+       TString fDAQlbPass;             // password of the DAQ logbook MySQL Server
+       TString fDAQlbDB;               // DB name of the DAQ logbook MySQL Server
+       TString fDAQlbTable;            // Table name of the DAQ logbook 
+       TString fShuttlelbTable;        // Table name of the Shuttle logbook
+       TString fRunTypelbTable;        // Table name of the Run typr logbook
+
+       TString fFXSHost[3];            // Host of the [DAQ, DCS, HLT] File eXchange Server
+       UInt_t  fFXSPort[3];            // Port of the [DAQ, DCS, HLT] File eXchange Server
+       TString fFXSUser[3];            // username of the [DAQ, DCS, HLT] File eXchange Server
+       TString fFXSPass[3];            // password of the [DAQ, DCS, HLT] File eXchange Server
+
+       TString fFXSdbHost[3];          // Host of the [DAQ, DCS, HLT] FXS database
+       UInt_t  fFXSdbPort[3];          // Port of the [DAQ, DCS, HLT] FXS database
+       TString fFXSdbUser[3];          // username of the [DAQ, DCS, HLT] FXS database
+       TString fFXSdbPass[3];          // password of the [DAQ, DCS, HLT] FXS database
+       TString fFXSdbName[3];          // name of the [DAQ, DCS, HLT] FXS database
+       TString fFXSdbTable[3];         // Table name of the [DAQ, DCS, HLT] FXS database
+
+       Int_t fMaxRetries;              // number of retries of a failed preprocessor
+       
+       Int_t fPPTimeOut;               // timeout until a preprocessor is killed
+       Int_t fPPMaxMem;                // maximum allowed memory until a preprocessor is killed
+       
+       TString fMonitorHost;           // host of the MonaLisa monitoring server
+       TString fMonitorTable;          // Monalisa's SHUTTLE table name
+
+       TMap fDetectorMap;              // Map of the detector-by-detector configuration
+       TObjArray fDetectorList;        // List of detectors with valid configuration
+
+       TString fShuttleInstanceHost;   // Instance of the SHUTTLE
+       TObjArray fProcessedDetectors;  // list of the detector to be processed by this machine
+       Bool_t fProcessAll;             // flag indicating that all detectors will be processed
+       Bool_t fIsValid;                // flag for the validity of the configuration
 
        ClassDef(AliShuttleConfig, 0);
 };