Project

General

Profile

0001-messagefacility-Remove-obsolete-Extensions-module.patch

Ben Morgan, 10/08/2014 09:36 AM

View differences:

messagefacility/CMakeLists.txt
1 1

  
2 2
include(CetMake)
3 3

  
4
add_subdirectory(Extensions)
5 4
add_subdirectory(MessageLogger)
6 5
add_subdirectory(MessageService)
7 6
add_subdirectory(Utilities)
messagefacility/Extensions/CMakeLists.txt
1
#
2
#  Extensions/CMakeLists.txt
3
#  -------------------------------------------------------------------
4
#
5
#  CMake build file for library Extensions
6
#
7

  
8
SET ( srcFiles
9
    Extensions.cc
10
    )
11

  
12
cet_make_library( LIBRARY_NAME MF_ExtModules
13
        	  SOURCE ${srcFiles}
14
        	  WITH_STATIC_LIBRARY )
15

  
16

  
17
# install files
18
install_headers()
19
install_source( EXTRAS CMakeLists.txt )
messagefacility/Extensions/Extensions.cc
1

  
2
#include "messagefacility/Extensions/Extensions.h"
3

  
4
using namespace mf;
5

  
6
MFExtensions::MFExtensions() {
7

  
8
}
9

  
10
MFExtensions::~MFExtensions() {
11

  
12
}
messagefacility/Extensions/Extensions.h
1
#ifndef MESSAGEFACILITY_MFEXTENSIONS_H
2
#define MESSAGEFACILITY_MFEXTENSIONS_H
3

  
4
// This is an empty Extension class
5

  
6
namespace mf {
7

  
8
class MFExtensions {
9

  
10
public:
11
  MFExtensions();
12
  ~MFExtensions();
13

  
14
};
15

  
16
}
17

  
18
#endif
messagefacility/MessageService/MessageLoggerScribe.cc
316 316
        clean_slate_configuration = false;                          // Change Log 22
317 317
      }
318 318

  
319
      std::string ext(cet::shlib_prefix() + "MF_ExtModules" + cet::shlib_suffix());
320
      void *hndl = dlopen(ext.c_str(), RTLD_NOW );
321
      if(hndl == NULL) {
322
        LogError("preconfiguration") << dlerror();
323
      }
324

  
325 319
      configure_fwkJobReports();                                    // Change Log 16
326 320
      configure_ordinary_destinations();                            // Change Log 16
327 321
      configure_statistics();                                       // Change Log 16
......
787 781
            {
788 782
              const bool append = dest_pset.get<bool>("append", false);
789 783

  
790
              auto os_sp = 
784
              auto os_sp =
791 785
                std::make_shared<std::ofstream>
792 786
                (
793 787
                 filename.c_str(),
794 788
                 append ? std::ios_base::app : std::ios_base::trunc
795 789
                 );
796
              
790

  
797 791
              ostream_ps.push_back(os_sp);
798 792
              os_p = os_sp.get();
799 793
              dest_ctrl = admin_p->attach( ELoutput(*os_sp) );
800 794
              stream_ps[filename] = os_sp.get();
801 795
            }
802
          else if ( dest_type == "syslog" ) 
796
          else if ( dest_type == "syslog" )
803 797
            {
804 798
              auto oss_sp = std::make_shared<std::ostringstream>();
805 799
              ostream_ps.push_back(oss_sp);
806
-