[asterisk-scf-commits] asterisk-scf/release/logger.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Mar 13 21:43:06 CDT 2012
branch "master" has been updated
via a526f2d3024ee92c8bc4779cb7915402cdb91a25 (commit)
via e66c1dc2295231a3622dab2baf44ae14e6bfb871 (commit)
from 8e2926240116cb660ce80b7d129fb84bd20f781e (commit)
Summary of changes:
include/AsteriskSCF/Logger/LogFormatter.h | 2 +-
server/src/CMakeLists.txt | 12 ++++++++++--
server/src/ChainedLogOut.h | 2 +-
server/src/Configuration.h | 2 +-
server/src/LoggingServer.h | 16 ++++++++--------
server/src/OstreamChainedLogOut.h | 2 +-
server/test/CMakeLists.txt | 7 ++++---
server/test/LoggingConfigurationHelper.cpp | 1 -
server/test/LoggingConfigurationHelper.h | 2 +-
9 files changed, 27 insertions(+), 19 deletions(-)
- Log -----------------------------------------------------------------
commit a526f2d3024ee92c8bc4779cb7915402cdb91a25
Author: David M. Lee <dlee at digium.com>
Date: Tue Mar 13 21:42:57 2012 -0500
Smattering DLL_EXPORT for to fix Windows
diff --git a/include/AsteriskSCF/Logger/LogFormatter.h b/include/AsteriskSCF/Logger/LogFormatter.h
index 7b6dd69..0fb6fd6 100644
--- a/include/AsteriskSCF/Logger/LogFormatter.h
+++ b/include/AsteriskSCF/Logger/LogFormatter.h
@@ -75,7 +75,7 @@ namespace Logging
* $L - The service locator params triad with commas between items. Same as specifying: "$C,$S,$I"
*/
-class LogFormatter
+class ASTSCF_DLL_EXPORT LogFormatter
{
public:
LogFormatter(const std::string& fmtStr = DefaultLogFormat);
diff --git a/server/src/ChainedLogOut.h b/server/src/ChainedLogOut.h
index eb5cedc..5b9f163 100644
--- a/server/src/ChainedLogOut.h
+++ b/server/src/ChainedLogOut.h
@@ -29,7 +29,7 @@ namespace System
namespace Logging
{
-class ChainedLogOut
+class ASTSCF_DLL_EXPORT ChainedLogOut
{
public:
ChainedLogOut()
diff --git a/server/src/Configuration.h b/server/src/Configuration.h
index fa5563d..32772b7 100644
--- a/server/src/Configuration.h
+++ b/server/src/Configuration.h
@@ -42,7 +42,7 @@ class ConfigurationServicePriv;
/**
* Privementation of the configuration service.
*/
-class LoggerConfigurationService : public AsteriskSCF::System::Configuration::V1::ConfigurationService
+class ASTSCF_DLL_EXPORT LoggerConfigurationService : public AsteriskSCF::System::Configuration::V1::ConfigurationService
{
public:
LoggerConfigurationService(LoggingServerIPtr server);
diff --git a/server/src/LoggingServer.h b/server/src/LoggingServer.h
index 3ad2b9d..a1bc515 100644
--- a/server/src/LoggingServer.h
+++ b/server/src/LoggingServer.h
@@ -61,12 +61,12 @@ private:
Level mLogLevel;
};
-class LoggingServerI : public LoggingServer
+class ASTSCF_DLL_EXPORT LoggingServerI : public LoggingServer
{
public:
- ASTSCF_DLL_EXPORT LoggingServerI();
+ LoggingServerI();
- ASTSCF_DLL_EXPORT void logs(const std::string& name, Level, const std::string& msg,
+ void logs(const std::string& name, Level, const std::string& msg,
const std::string& hostname, Ice::Long pid,
const std::string& componentCategory, const std::string& serviceId, const std::string& componentId,
const Ice::Current&) const;
@@ -75,13 +75,13 @@ public:
{
return getConfiguration();
}
- ASTSCF_DLL_EXPORT Configuration getConfiguration() const;
+ Configuration getConfiguration() const;
- ASTSCF_DLL_EXPORT bool isEnabledFor(const std::string& name, Level level) const;
- ASTSCF_DLL_EXPORT Level getEffectiveLevel(const std::string& name) const;
- ASTSCF_DLL_EXPORT void setLevel(const std::string& name, Level level);
+ bool isEnabledFor(const std::string& name, Level level) const;
+ Level getEffectiveLevel(const std::string& name) const;
+ void setLevel(const std::string& name, Level level);
- ASTSCF_DLL_EXPORT void configure(const ServerConfigurationListenerPrx& configurationListener, const Ice::PropertiesPtr& props);
+ void configure(const ServerConfigurationListenerPrx& configurationListener, const Ice::PropertiesPtr& props);
void removeLogOut(const boost::shared_ptr<ChainedLogOut> &out);
void addLogOut(const boost::shared_ptr<ChainedLogOut> &out);
diff --git a/server/src/OstreamChainedLogOut.h b/server/src/OstreamChainedLogOut.h
index 882245d..0e12280 100644
--- a/server/src/OstreamChainedLogOut.h
+++ b/server/src/OstreamChainedLogOut.h
@@ -29,7 +29,7 @@ namespace System
namespace Logging
{
-class OstreamChainedLogOut : public ChainedLogOut
+class ASTSCF_DLL_EXPORT OstreamChainedLogOut : public ChainedLogOut
{
public:
OstreamChainedLogOut(std::ostream& out) :
commit e66c1dc2295231a3622dab2baf44ae14e6bfb871
Author: David M. Lee <dlee at digium.com>
Date: Mon Mar 12 23:37:08 2012 -0500
Properly link logger config slice
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index 5aced67..bee4e5f 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -1,3 +1,11 @@
+astscf_slice_collection(GLOBAL
+ NAME LOGGING_SERVICE_LIB
+ PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../slice"
+ HEADERS "${CMAKE_CURRENT_BINARY_DIR}/LoggingServiceLib/slice-LOGGING_SERVICE_LIB"
+ LIBRARY LoggingServiceLib
+ )
+astscf_slice_include_collection(LOGGING_SERVICE_LIB)
+
astscf_component_init(LoggingServiceLib)
# an icebox module cannot be used as a shared lib, so build the bulk of the
# code as a static lib that can be linked into both the icebox module and
@@ -14,11 +22,11 @@ astscf_component_add_files(LoggingServiceLib LoggingServer.h)
astscf_component_add_files(LoggingServiceLib Configuration.h)
astscf_component_add_files(LoggingServiceLib ../../client/src/LogFormatter.cpp)
astscf_component_add_files(LoggingServiceLib ../../client/src/LogOut.cpp)
-astscf_component_add_slices(LoggingServiceLib PROJECT AsteriskSCF/Configuration/LoggingService/LoggingConfigurationIf.ice)
+astscf_component_add_slices(LoggingServiceLib LOGGING_SERVICE_LIB AsteriskSCF/Configuration/LoggingService/LoggingConfigurationIf.ice)
astscf_component_add_boost_libraries(LoggingServiceLib core thread filesystem date_time system)
astscf_component_add_ice_libraries(LoggingServiceLib IceStorm)
astscf_component_add_slice_collection_libraries(LoggingServiceLib ASTSCF)
-astscf_component_build_library(LoggingServiceLib STATIC)
+astscf_component_build_library(LoggingServiceLib)
# This lib is compiled into a .so, so it needs -fPIC set
if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index c585eb1..84096a0 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -9,13 +9,14 @@ astscf_component_build_standalone(LoggingServiceTest)
target_link_libraries(LoggingServiceTest LoggingServiceLib)
astscf_test_boost(LoggingServiceTest)
+astscf_slice_include_collection(LOGGING_SERVICE_LIB)
+
astscf_component_init(LoggingConfigurationTest)
astscf_component_add_files(LoggingConfigurationTest ConfigurationTest.cpp)
astscf_component_add_files(LoggingConfigurationTest LoggingConfigurationHelper.cpp)
astscf_component_add_files(LoggingConfigurationTest LoggingConfigurationHelper.h)
-astscf_component_add_slices(LoggingConfigurationTest PROJECT AsteriskSCF/Configuration/LoggingService/LoggingConfigurationIf.ice)
astscf_component_add_boost_libraries(LoggingConfigurationTest unit_test_framework system)
-astscf_component_add_slice_collection_libraries(LoggingConfigurationTest ASTSCF)
+astscf_component_add_slice_collection_libraries(LoggingConfigurationTest LOGGING_SERVICE_LIB)
astscf_component_build_icebox(LoggingConfigurationTest)
-target_link_libraries(LoggingConfigurationTest astscf-api LoggingServiceLib LoggingClient)
+target_link_libraries(LoggingConfigurationTest LoggingClient)
astscf_test_icebox(LoggingConfigurationTest server/config/testloggingserver.conf)
diff --git a/server/test/LoggingConfigurationHelper.cpp b/server/test/LoggingConfigurationHelper.cpp
index fa03dd7..8df5751 100644
--- a/server/test/LoggingConfigurationHelper.cpp
+++ b/server/test/LoggingConfigurationHelper.cpp
@@ -19,7 +19,6 @@
*/
#include "LoggingConfigurationHelper.h"
-#include "LoggingConfigurationIf.h"
namespace
{
diff --git a/server/test/LoggingConfigurationHelper.h b/server/test/LoggingConfigurationHelper.h
index 3535364..952508e 100644
--- a/server/test/LoggingConfigurationHelper.h
+++ b/server/test/LoggingConfigurationHelper.h
@@ -19,7 +19,7 @@
*/
#include <AsteriskSCF/System/Component/ConfigurationIf.h>
-#include "LoggingConfigurationIf.h"
+#include <AsteriskSCF/Configuration/LoggingService/LoggingConfigurationIf.h>
class LoggingConfigurationHelper
{
-----------------------------------------------------------------------
--
asterisk-scf/release/logger.git
More information about the asterisk-scf-commits
mailing list