Renamed MmcProxyLog to MmcProxy

mediachanger/CMakeLists.txt

@@ -39,7 +39,7 @@ set (MEDIACHANGER_LIB_SRC_FILES
   MediaChangerProxy.cpp
   MessageHeader.cpp
   messages.cpp
-  MmcProxyLog.cpp
+  MmcProxy.cpp
   ${ProtoSources}
   RmcMarshal.cpp
   RmcMarshal.hpp

mediachanger/MediaChangerFacade.hpp

@@ -22,7 +22,7 @@
 #include "mediachanger/AcsProxy.hpp"
 #include "mediachanger/LibrarySlot.hpp"
 #include "mediachanger/MediaChangerProxy.hpp"
-#include "mediachanger/MmcProxyLog.hpp"
+#include "mediachanger/MmcProxy.hpp"
 #include "mediachanger/RmcProxy.hpp"
 #include "mediachanger/ZmqContextSingleton.hpp"
 
@@ -109,7 +109,7 @@ private:
   /**
    * Manual media changer proxy.
    */
-  MmcProxyLog m_mmcProxy;
+  MmcProxy m_mmcProxy;
 
   /**
    * SCSI media changer proxy.

mediachanger/MmcProxyLog.cpp → mediachanger/MmcProxy.cpp

@@ -17,41 +17,42 @@
  */
 
 #include "mediachanger/ManualLibrarySlot.hpp"
-#include "mediachanger/MmcProxyLog.hpp"
+#include "mediachanger/MmcProxy.hpp"
+
+namespace cta {
+namespace mediachanger {
 
 //------------------------------------------------------------------------------
 // constructor
 //------------------------------------------------------------------------------
-cta::mediachanger::MmcProxyLog::MmcProxyLog(log::Logger &log) throw():
+MmcProxy::MmcProxy(log::Logger &log) throw():
   m_log(log) {
 }
 
 //------------------------------------------------------------------------------
 // mountTapeReadOnly
 //------------------------------------------------------------------------------
-void cta::mediachanger::MmcProxyLog::mountTapeReadOnly( const std::string &vid, const LibrarySlot &librarySlot) {
+void MmcProxy::mountTapeReadOnly( const std::string &vid, const LibrarySlot &librarySlot) {
   std::list<log::Param> params = {
     log::Param("TPVID", vid),
     log::Param("librarySlot", librarySlot.str())};
-  m_log(log::WARNING, "Tape should be manual mounted for read-only access",
-    params);
+  m_log(log::WARNING, "Tape should be manual mounted for read-only access", params);
 }
 
 //------------------------------------------------------------------------------
 // mountTapeReadWrite
 //------------------------------------------------------------------------------
-void cta::mediachanger::MmcProxyLog::mountTapeReadWrite(const std::string &vid, const LibrarySlot &librarySlot) {
+void MmcProxy::mountTapeReadWrite(const std::string &vid, const LibrarySlot &librarySlot) {
   std::list<log::Param> params = {
     log::Param("TPVID", vid),
     log::Param("librarySlot", librarySlot.str())};
-  m_log(log::WARNING, "Tape should be manual mounted for read/write access",
-    params);
+  m_log(log::WARNING, "Tape should be manual mounted for read/write access", params);
 }
 
 //------------------------------------------------------------------------------
 // dismountTape
 //------------------------------------------------------------------------------
-void cta::mediachanger::MmcProxyLog::dismountTape( const std::string &vid, const LibrarySlot &librarySlot) {
+void MmcProxy::dismountTape( const std::string &vid, const LibrarySlot &librarySlot) {
   std::list<log::Param> params = {
     log::Param("TPVID", vid),
     log::Param("librarySlot", librarySlot.str())};
@@ -61,9 +62,12 @@ void cta::mediachanger::MmcProxyLog::dismountTape( const std::string &vid, const
 //------------------------------------------------------------------------------
 // forceDismountTape
 //------------------------------------------------------------------------------
-void cta::mediachanger::MmcProxyLog::forceDismountTape(const std::string &vid, const LibrarySlot &librarySlot) {
+void MmcProxy::forceDismountTape(const std::string &vid, const LibrarySlot &librarySlot) {
   std::list<log::Param> params = {
     log::Param("TPVID", vid),
     log::Param("librarySlot", librarySlot.str())};
   m_log(log::WARNING, "Tape should be manual dismounted", params);
 }
+
+} // namespace medichanger
+} // namespace cta

mediachanger/MmcProxyLog.hpp → mediachanger/MmcProxy.hpp

@@ -25,10 +25,9 @@ namespace cta {
 namespace mediachanger {
 
 /**
- * Concrete class implementing a MmcProxy that simply logs mount and dismount
- * requests.
+ * Manual media changer proxy that simply logs mount and dismount requests.
  */
-class MmcProxyLog: public MediaChangerProxy {
+class MmcProxy: public MediaChangerProxy {
 public:
 
   /**
@@ -36,7 +35,7 @@ public:
    *
    * @param log Object representing the API to the CTA logging system.
    */
-  MmcProxyLog(log::Logger &log) throw();
+  MmcProxy(log::Logger &log) throw();
 
   /**
    * Requests the media changer to mount the specified tape for read-only
@@ -88,7 +87,7 @@ private:
    */
   log::Logger &m_log;
 
-}; // class MmcProxyLog
+}; // class MmcProxy
 
 } // namespace mediachanger
 } // namespace cta