From 0453dcf1c70620ff452c83f09b9989b58d04586d Mon Sep 17 00:00:00 2001 From: Jihoon Chung Date: Wed, 17 Jul 2013 11:40:20 +0900 Subject: [PATCH] Replace LogInfo to LogDebug [Issue#] N/A [Problem] N/A [Cause] N/A [Solution] Replace LogInfo to LogDebug Platform policy isn't used LogInfo [SCMRequest] N/A Change-Id: I7517004391b9e22cc0f48ede3443032acd1eb1b6 --- examples/dbus/server-example/server-example.cpp | 4 +- examples/fake_rpc/fake_rpc.cpp | 56 ++++++++--------- examples/metronome/metronome_client.cpp | 10 +-- examples/metronome/metronome_server.cpp | 8 +-- examples/rpc/rpc.cpp | 72 +++++++++++----------- examples/simple/simple.cpp | 2 +- examples/socket/socket.cpp | 18 +++--- examples/tcpsock/tcpsock.cpp | 12 ++-- examples/timed_event/timed_event.cpp | 4 +- modules/certificate_dao/dao/certificate_dao.cpp | 2 +- .../db/include/dpl/db/thread_database_support.h | 6 +- .../include/dpl/dbus/dbus_interface_dispatcher.h | 4 +- modules/dbus/src/server.cpp | 4 +- .../dao/security_origin_dao.cpp | 2 +- modules/widget_dao/dao/feature_dao.cpp | 6 +- modules/widget_dao/dao/global_dao_read_only.cpp | 2 +- modules/widget_dao/dao/plugin_dao.cpp | 4 +- tests/common/src/loop_control.cpp | 2 +- tests/core/test_thread.cpp | 8 +-- tests/dao/tests_dao.cpp | 2 +- tests/dbus/main.cpp | 2 +- tests/event/test_event_support.cpp | 2 +- tests/event/test_ic_delegate.cpp | 2 +- .../Localization_testcases.cpp | 12 ++-- tests/localizationTagsProvider/tests_miscunit.cpp | 2 +- tests/unused/test_message_queue.cpp | 6 +- tests/unused/test_shm.cpp | 24 ++++---- tests/unused/test_task.cpp | 6 +- 28 files changed, 142 insertions(+), 142 deletions(-) mode change 100755 => 100644 modules/security_origin_dao/dao/security_origin_dao.cpp diff --git a/examples/dbus/server-example/server-example.cpp b/examples/dbus/server-example/server-example.cpp index a733c70..84e665d 100644 --- a/examples/dbus/server-example/server-example.cpp +++ b/examples/dbus/server-example/server-example.cpp @@ -52,14 +52,14 @@ public: GVariant *parameters, GDBusMethodInvocation *invocation) { - LogInfo("On method call: " << methodName); + LogDebug("On method call: " << methodName); if (g_strcmp0(methodName, "echo") == 0) { const gchar* arg = NULL; g_variant_get(parameters, "(&s)", &arg); - LogInfo("Client said: " << arg); + LogDebug("Client said: " << arg); gchar* response = g_strdup_printf(arg); g_dbus_method_invocation_return_value(invocation, diff --git a/examples/fake_rpc/fake_rpc.cpp b/examples/fake_rpc/fake_rpc.cpp index 82a2443..bab1069 100644 --- a/examples/fake_rpc/fake_rpc.cpp +++ b/examples/fake_rpc/fake_rpc.cpp @@ -67,10 +67,10 @@ private: virtual void OnEventReceived(const AsyncCallEvent &event) { - LogInfo("CLIENT: AsyncCallEvent received"); + LogDebug("CLIENT: AsyncCallEvent received"); event.GetArg0().ConsumeArg(m_receivedData); - LogInfo("CLIENT: Result from server: " << m_receivedData); + LogDebug("CLIENT: Result from server: " << m_receivedData); if (m_receivedData != m_sentData) LogError("Wrong data Received!"); @@ -80,14 +80,14 @@ private: { if (dynamic_cast(event.GetArg1())){ ++m_connections; - LogInfo("CLIENT: Acquiring new fake connection"); + LogDebug("CLIENT: Acquiring new fake connection"); m_rpcFakeConnection.reset(event.GetArg1()); //this is not used on this side // m_rpcFakeConnection->DPL::EventSupport::AddListener(this); } else{ ++m_connections; - LogInfo("CLIENT: Acquiring new unix connection"); + LogDebug("CLIENT: Acquiring new unix connection"); m_rpcUnixConnection.reset(event.GetArg1()); m_rpcUnixConnection->DPL::EventSupport::AddListener(this); } @@ -96,7 +96,7 @@ private: // Emit RPC function call DPL::RPCFunction proc; proc.AppendArg(m_sentData); - LogInfo("CLIENT: Calling RPC function"); + LogDebug("CLIENT: Calling RPC function"); m_rpcFakeConnection->AsyncCall(proc); } } @@ -120,41 +120,41 @@ public: { m_connections = 0; // Attach RPC listeners - LogInfo("CLIENT: Attaching connection established event"); + LogDebug("CLIENT: Attaching connection established event"); m_rpcUnixClient.DPL::EventSupport::AddListener(this); m_rpcFakeClient.DPL::EventSupport::AddListener(this); // Open connection to server - LogInfo("CLIENT: Opening connection to RPC"); + LogDebug("CLIENT: Opening connection to RPC"); m_rpcUnixClient.Open(UNIX_RPC_NAME); m_rpcFakeClient.Open(FAKE_RPC_NAME); // Start message loop - LogInfo("CLIENT: Starting thread event loop"); + LogDebug("CLIENT: Starting thread event loop"); int ret = Exec(); if (m_rpcUnixConnection.get()){ - LogInfo("CLIENT: Removing Unix connection"); + LogDebug("CLIENT: Removing Unix connection"); m_rpcUnixConnection->DPL::EventSupport::RemoveListener(this); m_rpcUnixConnection.reset(); } - LogInfo("CLIENT: Closing"); + LogDebug("CLIENT: Closing"); if (m_rpcFakeConnection.get()){ - LogInfo("CLIENT: Removing Fake connection"); + LogDebug("CLIENT: Removing Fake connection"); //this is not used on this side // m_rpcFakeConnection->DPL::EventSupport::RemoveListener(this); m_rpcFakeConnection.reset(); } // Detach RPC client listener - LogInfo("CLIENT: Detaching connection established event"); + LogDebug("CLIENT: Detaching connection established event"); m_rpcUnixClient.DPL::EventSupport::RemoveListener(this); m_rpcFakeClient.DPL::EventSupport::RemoveListener(this); // Close RPC - LogInfo("CLIENT: Closing RPC client"); + LogDebug("CLIENT: Closing RPC client"); m_rpcUnixClient.CloseAll(); m_rpcFakeClient.Close();//not needed @@ -185,7 +185,7 @@ private: // Quit application event occurred virtual void OnEventReceived(const QuitEvent &/*event*/){ // Close RPC now - LogInfo("SERVER: Closing RPC connection..."); + LogDebug("SERVER: Closing RPC connection..."); // Detach RPC connection listeners if (m_rpcUnixConnection.get()) { @@ -199,13 +199,13 @@ private: m_rpcFakeConnection.reset(); } - LogInfo("SERVER: Closing Server"); + LogDebug("SERVER: Closing Server"); m_rpcUnixServer.CloseAll(); m_rpcFakeServer.CloseAll();//not needed m_rpcUnixServer.DPL::EventSupport::RemoveListener(this); m_rpcFakeServer.DPL::EventSupport::RemoveListener(this); - LogInfo("SERVER: Server closed"); + LogDebug("SERVER: Server closed"); Quit(); } @@ -216,17 +216,17 @@ private: virtual void OnEventReceived(const AsyncCallEvent &event) { - LogInfo("SERVER: AsyncCallEvent received"); + LogDebug("SERVER: AsyncCallEvent received"); int value; event.GetArg0().ConsumeArg(value); - LogInfo("SERVER: Result from client: " << value); + LogDebug("SERVER: Result from client: " << value); // send back data to client (via fake) // Emit RPC function call DPL::RPCFunction proc; proc.AppendArg(value); - LogInfo("SERVER: Calling RPC function"); + LogDebug("SERVER: Calling RPC function"); m_rpcUnixConnection->AsyncCall(proc); } @@ -234,12 +234,12 @@ private: { // Save connection pointer if (dynamic_cast(event.GetArg1())){ - LogInfo("SERVER: Acquiring Fake RPC connection"); + LogDebug("SERVER: Acquiring Fake RPC connection"); m_rpcFakeConnection.reset(event.GetArg1()); m_rpcFakeConnection->DPL::EventSupport::AddListener(this); } else{ - LogInfo("SERVER: Acquiring Unix RPC connection"); + LogDebug("SERVER: Acquiring Unix RPC connection"); m_rpcUnixConnection.reset(event.GetArg1()); //this is not used on this side // m_rpcUnixConnection->DPL::EventSupport::AddListener(this); @@ -251,25 +251,25 @@ public: : Application(argc, argv, "rpc") { // Attach RPC server listeners - LogInfo("SERVER: Attaching connection established event"); + LogDebug("SERVER: Attaching connection established event"); m_rpcUnixServer.DPL::EventSupport::AddListener(this); m_rpcFakeServer.DPL::EventSupport::AddListener(this); // Self touch - LogInfo("SERVER: Touching controller"); + LogDebug("SERVER: Touching controller"); Touch(); // Open RPC server - LogInfo("SERVER: Opening server RPC"); + LogDebug("SERVER: Opening server RPC"); m_rpcUnixServer.Open(UNIX_RPC_NAME); m_rpcFakeServer.Open(FAKE_RPC_NAME); // Run RPC client in thread - LogInfo("SERVER: Starting RPC client thread"); + LogDebug("SERVER: Starting RPC client thread"); m_thread.Run(); // Quit application automatically in few seconds - LogInfo("SERVER: Sending control timed events"); + LogDebug("SERVER: Sending control timed events"); DPL::ControllerEventHandler::PostTimedEvent(CloseThreadEvent(), 2); DPL::ControllerEventHandler::PostTimedEvent(QuitEvent(), 3); } @@ -277,13 +277,13 @@ public: virtual ~MyApplication() { // Quit thread - LogInfo("SERVER: Quitting thread"); + LogDebug("SERVER: Quitting thread"); } }; int main(int argc, char *argv[]) { - LogInfo("Starting"); + LogDebug("Starting"); MyApplication app(argc, argv); return app.Exec(); } diff --git a/examples/metronome/metronome_client.cpp b/examples/metronome/metronome_client.cpp index 4184f54..1fca0df 100644 --- a/examples/metronome/metronome_client.cpp +++ b/examples/metronome/metronome_client.cpp @@ -41,14 +41,14 @@ private: (void)event; // Heart beat - LogInfo("* Got metronome signal *"); + LogDebug("* Got metronome signal *"); } virtual void OnEventReceived(const DPL::AbstractRPCConnectionEvents::ConnectionClosedEvent &event) { (void)event; - LogInfo("Connection closed"); + LogDebug("Connection closed"); // Must quit Quit(); @@ -58,7 +58,7 @@ private: { (void)event; - LogInfo("Connection broken"); + LogDebug("Connection broken"); // Must quit Quit(); @@ -67,7 +67,7 @@ private: virtual void OnEventReceived(const DPL::AbstractRPCConnectorEvents::ConnectionEstablishedEvent &event) { // Save connection pointer - LogInfo("Connected to metronome server"); + LogDebug("Connected to metronome server"); m_rpcConnection.reset(event.GetArg1()); // Attach event listeners @@ -87,7 +87,7 @@ public: m_rpcClient.Open("127.0.0.1", 12345); // Started - LogInfo("Metronome client started"); + LogDebug("Metronome client started"); } virtual ~MetronomeClientApplication() diff --git a/examples/metronome/metronome_server.cpp b/examples/metronome/metronome_server.cpp index 508f61d..cc0ad0a 100644 --- a/examples/metronome/metronome_server.cpp +++ b/examples/metronome/metronome_server.cpp @@ -103,7 +103,7 @@ private: { (void)event; - LogInfo("Connection closed"); + LogDebug("Connection closed"); // Remove connection from list RemoveConnection(static_cast(event.GetSender())); @@ -113,7 +113,7 @@ private: { (void)event; - LogInfo("Connection broken"); + LogDebug("Connection broken"); // Remove connection from list RemoveConnection(static_cast(event.GetSender())); @@ -122,7 +122,7 @@ private: virtual void OnEventReceived(const DPL::AbstractRPCConnectorEvents::ConnectionEstablishedEvent &event) { // Save connection pointer - LogInfo("New connection"); + LogDebug("New connection"); // Add nre connection to list AddConnection(event.GetArg1()); @@ -145,7 +145,7 @@ public: DPL::ControllerEventHandler::PostTimedEvent(SignalEvent(), HEART_BEAT_INTERVAL); // Started - LogInfo("Metronome server started"); + LogDebug("Metronome server started"); } virtual ~MetronomeServerApplication() diff --git a/examples/rpc/rpc.cpp b/examples/rpc/rpc.cpp index e1e2a64..6991edb 100644 --- a/examples/rpc/rpc.cpp +++ b/examples/rpc/rpc.cpp @@ -47,43 +47,43 @@ private: { (void)event; - LogInfo("CLIENT: AsyncCallEvent received"); + LogDebug("CLIENT: AsyncCallEvent received"); int value; event.GetArg0().ConsumeArg(value); - LogInfo("CLIENT: Result from server: " << value); + LogDebug("CLIENT: Result from server: " << value); } virtual void OnEventReceived(const DPL::AbstractRPCConnectionEvents::ConnectionClosedEvent &event) { (void)event; - LogInfo("CLIENT: ConnectionClosedEvent received"); + LogDebug("CLIENT: ConnectionClosedEvent received"); } virtual void OnEventReceived(const DPL::AbstractRPCConnectionEvents::ConnectionBrokenEvent &event) { (void)event; - LogInfo("CLIENT: ConnectionBrokenEvent received"); + LogDebug("CLIENT: ConnectionBrokenEvent received"); } virtual void OnEventReceived(const DPL::AbstractRPCConnectorEvents::ConnectionEstablishedEvent &event) { // Save connection pointer - LogInfo("CLIENT: Acquiring new connection"); + LogDebug("CLIENT: Acquiring new connection"); m_rpcConnection.reset(event.GetArg1()); // Attach listener to new connection - LogInfo("CLIENT: Attaching connection event listeners"); + LogDebug("CLIENT: Attaching connection event listeners"); m_rpcConnection->DPL::EventSupport::AddListener(this); m_rpcConnection->DPL::EventSupport::AddListener(this); m_rpcConnection->DPL::EventSupport::AddListener(this); - LogInfo("CLIENT: Connection established"); + LogDebug("CLIENT: Connection established"); // Emit RPC function call DPL::RPCFunction proc; proc.AppendArg((int)1111); - LogInfo("CLIENT: Calling RPC function"); + LogDebug("CLIENT: Calling RPC function"); m_rpcConnection->AsyncCall(proc); } @@ -97,35 +97,35 @@ public: virtual int ThreadEntry() { // Attach RPC listeners - LogInfo("CLIENT: Attaching connection established event"); + LogDebug("CLIENT: Attaching connection established event"); m_rpcClient.DPL::EventSupport::AddListener(this); // Open connection to server - LogInfo("CLIENT: Opening connection to RPC"); + LogDebug("CLIENT: Opening connection to RPC"); m_rpcClient.Open(RPC_NAME); // Start message loop - LogInfo("CLIENT: Starting thread event loop"); + LogDebug("CLIENT: Starting thread event loop"); int ret = Exec(); // Detach RPC listeners if (m_rpcConnection.get()) { - LogInfo("CLIENT: Detaching RPC connection events"); + LogDebug("CLIENT: Detaching RPC connection events"); m_rpcConnection->DPL::EventSupport::RemoveListener(this); m_rpcConnection->DPL::EventSupport::RemoveListener(this); m_rpcConnection->DPL::EventSupport::RemoveListener(this); - LogInfo("CLIENT: Resetting connection"); + LogDebug("CLIENT: Resetting connection"); m_rpcConnection.reset(); } // Detach RPC client listener - LogInfo("CLIENT: Detaching connection established event"); + LogDebug("CLIENT: Detaching connection established event"); m_rpcClient.DPL::EventSupport::RemoveListener(this); // Close RPC - LogInfo("CLIENT: Closing RPC client"); + LogDebug("CLIENT: Closing RPC client"); m_rpcClient.CloseAll(); // Done @@ -168,61 +168,61 @@ private: { (void)event; - LogInfo("SERVER: AsyncCallEvent received"); + LogDebug("SERVER: AsyncCallEvent received"); int value; event.GetArg0().ConsumeArg(value); - LogInfo("SERVER: Result from client: " << value); + LogDebug("SERVER: Result from client: " << value); } virtual void OnEventReceived(const DPL::AbstractRPCConnectionEvents::ConnectionClosedEvent &event) { (void)event; - LogInfo("SERVER: ConnectionClosedEvent received"); + LogDebug("SERVER: ConnectionClosedEvent received"); // Close RPC now - LogInfo("SERVER: Closing RPC connection on event..."); + LogDebug("SERVER: Closing RPC connection on event..."); // Detach RPC connection listeners if (m_rpcConnection.get()) { - LogInfo("SERVER: Detaching connection events"); + LogDebug("SERVER: Detaching connection events"); m_rpcConnection->DPL::EventSupport::RemoveListener(this); m_rpcConnection->DPL::EventSupport::RemoveListener(this); m_rpcConnection->DPL::EventSupport::RemoveListener(this); } - LogInfo("SERVER: RPC connection closed"); + LogDebug("SERVER: RPC connection closed"); - LogInfo("SERVER: Closing RPC on event..."); + LogDebug("SERVER: Closing RPC on event..."); m_rpcServer.CloseAll(); - LogInfo("SERVER: RPC closed"); + LogDebug("SERVER: RPC closed"); } virtual void OnEventReceived(const DPL::AbstractRPCConnectionEvents::ConnectionBrokenEvent &event) { (void)event; - LogInfo("SERVER: ConnectionBrokenEvent received"); + LogDebug("SERVER: ConnectionBrokenEvent received"); } virtual void OnEventReceived(const DPL::AbstractRPCConnectorEvents::ConnectionEstablishedEvent &event) { // Save connection pointer - LogInfo("SERVER: Acquiring RPC connection"); + LogDebug("SERVER: Acquiring RPC connection"); m_rpcConnection.reset(event.GetArg1()); // Attach event listeners - LogInfo("SERVER: Attaching connection listeners"); + LogDebug("SERVER: Attaching connection listeners"); m_rpcConnection->DPL::EventSupport::AddListener(this); m_rpcConnection->DPL::EventSupport::AddListener(this); m_rpcConnection->DPL::EventSupport::AddListener(this); - LogInfo("SERVER: Connection established"); + LogDebug("SERVER: Connection established"); // Emit RPC function call DPL::RPCFunction proc; proc.AppendArg((int)2222); - LogInfo("SERVER: Calling RPC function"); + LogDebug("SERVER: Calling RPC function"); m_rpcConnection->AsyncCall(proc); } @@ -231,23 +231,23 @@ public: : Application(argc, argv, "rpc") { // Attach RPC server listeners - LogInfo("SERVER: Attaching connection established event"); + LogDebug("SERVER: Attaching connection established event"); m_rpcServer.DPL::EventSupport::AddListener(this); // Self touch - LogInfo("SERVER: Touching controller"); + LogDebug("SERVER: Touching controller"); Touch(); // Open RPC server - LogInfo("SERVER: Opening server RPC"); + LogDebug("SERVER: Opening server RPC"); m_rpcServer.Open(RPC_NAME); // Run RPC client in thread - LogInfo("SERVER: Starting RPC client thread"); + LogDebug("SERVER: Starting RPC client thread"); m_thread.Run(); // Quit application automatically in few seconds - LogInfo("SERVER: Sending control timed events"); + LogDebug("SERVER: Sending control timed events"); DPL::ControllerEventHandler::PostTimedEvent(CloseThreadEvent(), 2); DPL::ControllerEventHandler::PostTimedEvent(QuitEvent(), 3); } @@ -255,11 +255,11 @@ public: virtual ~MyApplication() { // Quit thread - LogInfo("SERVER: Quitting thread"); + LogDebug("SERVER: Quitting thread"); m_thread.Quit(); // Close RPC server - LogInfo("SERVER: Closing RPC server"); + LogDebug("SERVER: Closing RPC server"); m_rpcServer.CloseAll(); // Detach RPC server listener @@ -269,7 +269,7 @@ public: int main(int argc, char *argv[]) { - LogInfo("Starting"); + LogDebug("Starting"); MyApplication app(argc, argv); return app.Exec(); } diff --git a/examples/simple/simple.cpp b/examples/simple/simple.cpp index 6da8409..2ed9fab 100644 --- a/examples/simple/simple.cpp +++ b/examples/simple/simple.cpp @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) { (void)argc; (void)argv; - LogInfo("Hello world!"); + LogDebug("Hello world!"); return 0; } diff --git a/examples/socket/socket.cpp b/examples/socket/socket.cpp index fca68ab..fc42632 100644 --- a/examples/socket/socket.cpp +++ b/examples/socket/socket.cpp @@ -46,12 +46,12 @@ private: virtual void OnEventReceived(const DPL::AbstractSocketEvents::AcceptEvent &event) { (void)event; - LogInfo("Accept event occurred"); + LogDebug("Accept event occurred"); DPL::UnixSocket *client = static_cast(m_socket.Accept()); - LogInfo("Accepted client remote address: " << client->GetRemoteAddress().ToString()); - LogInfo("Accepted client local address: " << client->GetLocalAddress().ToString()); + LogDebug("Accepted client remote address: " << client->GetRemoteAddress().ToString()); + LogDebug("Accepted client local address: " << client->GetLocalAddress().ToString()); delete client; } @@ -69,14 +69,14 @@ public: m_socket.DPL::EventSupport::AddListener(this); // Create server - LogInfo("Starting server..."); + LogDebug("Starting server..."); m_socket.Bind(DPL::Address(SOCKET_NAME)); m_socket.Listen(5); - LogInfo("Server started"); + LogDebug("Server started"); - LogInfo("Server local address: " << m_socket.GetLocalAddress().ToString()); + LogDebug("Server local address: " << m_socket.GetLocalAddress().ToString()); int result = Exec(); @@ -112,7 +112,7 @@ private: virtual void OnEventReceived(const DPL::AbstractSocketEvents::ConnectedEvent &event) { (void)event; - LogInfo("Connected event occurred"); + LogDebug("Connected event occurred"); } public: @@ -126,12 +126,12 @@ public: Touch(); // Start threaded server - LogInfo("Running threaded server"); + LogDebug("Running threaded server"); // Run server in thread thread.Run(); - LogInfo("Waiting for server to start..."); + LogDebug("Waiting for server to start..."); sleep(1); // Connect to server diff --git a/examples/tcpsock/tcpsock.cpp b/examples/tcpsock/tcpsock.cpp index 1bae958..57141ca 100644 --- a/examples/tcpsock/tcpsock.cpp +++ b/examples/tcpsock/tcpsock.cpp @@ -41,7 +41,7 @@ private: virtual void OnEventReceived(const DPL::AbstractSocketEvents::ConnectedEvent &event) { (void)event; - LogInfo("Connected!"); + LogDebug("Connected!"); // Send request DPL::BinaryQueue data; @@ -53,7 +53,7 @@ private: virtual void OnEventReceived(const DPL::AbstractSocketEvents::ReadEvent &event) { (void)event; - LogInfo("Read!"); + LogDebug("Read!"); DPL::BinaryQueueAutoPtr data = m_socket.Read(100); // Bad: DLOG cannot log more than about 450 bytes... @@ -61,7 +61,7 @@ private: if (data->Empty()) { - LogInfo("Connection closed!"); + LogDebug("Connection closed!"); m_socket.Close(); // Done @@ -82,7 +82,7 @@ public: MyApplication(int argc, char **argv) : Application(argc, argv, "tcpsock") { - LogInfo("CTOR!"); + LogDebug("CTOR!"); // Add listeners m_socket.DPL::EventSupport::AddListener(this); @@ -90,13 +90,13 @@ public: // Connect m_socket.Open(); - LogInfo("Connecting..."); + LogDebug("Connecting..."); m_socket.Connect(DPL::Address("en.wikipedia.org", 80)); } virtual ~MyApplication() { - LogInfo("DTOR!"); + LogDebug("DTOR!"); // Remove listeners m_socket.DPL::EventSupport::RemoveListener(this); diff --git a/examples/timed_event/timed_event.cpp b/examples/timed_event/timed_event.cpp index 4e32cef..f3d8e80 100644 --- a/examples/timed_event/timed_event.cpp +++ b/examples/timed_event/timed_event.cpp @@ -39,13 +39,13 @@ protected: virtual void OnEventReceived(const FirstEvent &event) { (void)event; - LogInfo("First event occurred"); + LogDebug("First event occurred"); } virtual void OnEventReceived(const SecondEvent &event) { (void)event; - LogInfo("Second event occurred"); + LogDebug("Second event occurred"); } }; diff --git a/modules/certificate_dao/dao/certificate_dao.cpp b/modules/certificate_dao/dao/certificate_dao.cpp index d5506eb..877d5a8 100755 --- a/modules/certificate_dao/dao/certificate_dao.cpp +++ b/modules/certificate_dao/dao/certificate_dao.cpp @@ -85,7 +85,7 @@ void checkDatabase(std::string databasePath) struct stat buffer; if (stat(databasePath.c_str(), &buffer) != 0) { //Create fresh database - LogInfo("Creating database " << databasePath); + LogDebug("Creating database " << databasePath); std::fstream file; file.open(CERTIFICATE_DB_SQL_PATH, std::ios_base::in); diff --git a/modules/db/include/dpl/db/thread_database_support.h b/modules/db/include/dpl/db/thread_database_support.h index 52cfb33..02d796f 100644 --- a/modules/db/include/dpl/db/thread_database_support.h +++ b/modules/db/include/dpl/db/thread_database_support.h @@ -97,7 +97,7 @@ class ThreadDatabaseSupport : } // Destroy connection - LogInfo("Destroying thread database connection: " << m_address); + LogDebug("Destroying thread database connection: " << m_address); delete *Connection(); @@ -157,7 +157,7 @@ class ThreadDatabaseSupport : } // Initialize SQL connection described in traits - LogInfo("Attaching thread database connection: " << m_address); + LogDebug("Attaching thread database connection: " << m_address); Connection() = new DPL::DB::SqlConnection( m_address.c_str(), m_flags, options); @@ -194,7 +194,7 @@ class ThreadDatabaseSupport : // It must not be in linger state yet Assert(*Linger() == false); - LogInfo("Detaching thread database connection: " << m_address); + LogDebug("Detaching thread database connection: " << m_address); // Enter linger state *Linger() = true; diff --git a/modules/dbus/include/dpl/dbus/dbus_interface_dispatcher.h b/modules/dbus/include/dpl/dbus/dbus_interface_dispatcher.h index ec1b06b..97d7407 100644 --- a/modules/dbus/include/dpl/dbus/dbus_interface_dispatcher.h +++ b/modules/dbus/include/dpl/dbus/dbus_interface_dispatcher.h @@ -81,7 +81,7 @@ class InterfaceDispatcher : public DBus::Dispatcher const gchar* /*interfaceName*/, const gchar* propertyName) { - LogInfo("InterfaceDispatcher onPropertyGet: " << propertyName); + LogDebug("InterfaceDispatcher onPropertyGet: " << propertyName); return NULL; } @@ -92,7 +92,7 @@ class InterfaceDispatcher : public DBus::Dispatcher const gchar* propertyName, GVariant* /*value*/) { - LogInfo("InterfaceDispatcher onPropertySet: " << propertyName); + LogDebug("InterfaceDispatcher onPropertySet: " << propertyName); return false; } diff --git a/modules/dbus/src/server.cpp b/modules/dbus/src/server.cpp index 421090f..a71e4bd 100644 --- a/modules/dbus/src/server.cpp +++ b/modules/dbus/src/server.cpp @@ -80,7 +80,7 @@ void Server::start() G_CALLBACK(onNewConnection), this); - LogInfo("Server started at: " + LogDebug("Server started at: " << g_dbus_server_get_client_address(m_server)); } @@ -102,7 +102,7 @@ gboolean Server::onNewConnection(GDBusServer* /*server*/, ServerEvents::NewConnectionEvent event( ConnectionPtr(new Connection(connection))); - LogInfo("Emitting new connection event"); + LogDebug("Emitting new connection event"); // TODO Blocking to allow object registration before any DBus messages are // processed. self->DPL::Event::EventSupport:: diff --git a/modules/security_origin_dao/dao/security_origin_dao.cpp b/modules/security_origin_dao/dao/security_origin_dao.cpp old mode 100755 new mode 100644 index 514df6f..1e2e1f2 --- a/modules/security_origin_dao/dao/security_origin_dao.cpp +++ b/modules/security_origin_dao/dao/security_origin_dao.cpp @@ -83,7 +83,7 @@ void checkDatabase(std::string databasePath) struct stat buffer; if (stat(databasePath.c_str(), &buffer) != 0) { //Create fresh database - LogInfo("Creating database " << databasePath); + LogDebug("Creating database " << databasePath); std::fstream file; file.open(SECURITY_ORIGIN_DB_SQL_PATH, std::ios_base::in); diff --git a/modules/widget_dao/dao/feature_dao.cpp b/modules/widget_dao/dao/feature_dao.cpp index ba12c24..4a6a6a4 100644 --- a/modules/widget_dao/dao/feature_dao.cpp +++ b/modules/widget_dao/dao/feature_dao.cpp @@ -52,7 +52,7 @@ FeatureHandle RegisterFeature(const PluginMetafileData::Feature &feature, //register feature { - LogInfo(" |-- Registering feature " << feature.m_name); + LogDebug(" |-- Registering feature " << feature.m_name); FeaturesList::Row row; row.Set_FeatureName(DPL::FromUTF8String(feature.m_name)); @@ -73,7 +73,7 @@ FeatureHandle RegisterFeature(const PluginMetafileData::Feature &feature, int deviceCapID; if (FeatureDAOReadOnly::isDeviceCapabilityInstalled(*itdev)) { - LogInfo(" | |--DeviceCap " << *itdev << + LogDebug(" | |--DeviceCap " << *itdev << " already installed!"); WRT_DB_SELECT(select, @@ -86,7 +86,7 @@ FeatureHandle RegisterFeature(const PluginMetafileData::Feature &feature, deviceCapID = select->GetSingleValue(); } else { - LogInfo(" | |--Register DeviceCap: " << *itdev); + LogDebug(" | |--Register DeviceCap: " << *itdev); DeviceCapabilities::Row row; row.Set_DeviceCapName(DPL::FromUTF8String(*itdev)); diff --git a/modules/widget_dao/dao/global_dao_read_only.cpp b/modules/widget_dao/dao/global_dao_read_only.cpp index 06bbb8f..968839b 100644 --- a/modules/widget_dao/dao/global_dao_read_only.cpp +++ b/modules/widget_dao/dao/global_dao_read_only.cpp @@ -173,7 +173,7 @@ WidgetAccessInfoList GlobalDAOReadOnly::GetWhiteURIList() whiteURI.strIRI = i->Get_uri(); whiteURI.bSubDomains = i->Get_subdomain_access(); resultList.push_back(whiteURI); - LogInfo("[uri] : " << whiteURI.strIRI << + LogDebug("[uri] : " << whiteURI.strIRI << ", [subdomain] : " << whiteURI.bSubDomains); } return resultList; diff --git a/modules/widget_dao/dao/plugin_dao.cpp b/modules/widget_dao/dao/plugin_dao.cpp index cc8dcbf..5b899c3 100644 --- a/modules/widget_dao/dao/plugin_dao.cpp +++ b/modules/widget_dao/dao/plugin_dao.cpp @@ -49,7 +49,7 @@ DbPluginHandle PluginDAO::registerPlugin(const PluginMetafileData& metafile, if (isPluginInstalled(metafile.m_libraryName)) { handle = PluginDAO(metafile.m_libraryName).getPluginHandle(); - LogInfo(" >> Library " << metafile.m_libraryName << + LogDebug(" >> Library " << metafile.m_libraryName << " is already registered. Handle: " << handle); } else { LogDebug("Register Plugin: " << metafile.m_libraryName); @@ -219,7 +219,7 @@ void PluginDAO::unregisterPlugin(DbPluginHandle pluginHandle) &WrtDatabase::interface()); if (!isPluginInstalled(pluginHandle)) { - LogInfo("PluginHandle is invalid. Handle: " << pluginHandle); + LogDebug("PluginHandle is invalid. Handle: " << pluginHandle); return; } else { using namespace DPL::DB::ORM; diff --git a/tests/common/src/loop_control.cpp b/tests/common/src/loop_control.cpp index 4855288..5c690c2 100644 --- a/tests/common/src/loop_control.cpp +++ b/tests/common/src/loop_control.cpp @@ -34,7 +34,7 @@ void init_loop(int argc, char *argv[]) g_type_init(); g_thread_init(NULL); - LogInfo("Starting"); + LogDebug("Starting"); elm_init(argc, argv); } diff --git a/tests/core/test_thread.cpp b/tests/core/test_thread.cpp index 5db0dc1..8eec1f0 100644 --- a/tests/core/test_thread.cpp +++ b/tests/core/test_thread.cpp @@ -33,18 +33,18 @@ class Foo int id; Foo(int i = 0) : id(i) { - LogInfo("Foo: ctor: " << id); + LogDebug("Foo: ctor: " << id); } ~Foo() { - LogInfo("Foo: dtor: " << id); + LogDebug("Foo: dtor: " << id); g_wasFooDeleted = true; } void Bar() { - LogInfo("Foo: bar"); + LogDebug("Foo: bar"); } }; @@ -57,7 +57,7 @@ class FooThread : protected: virtual int ThreadEntry() { - LogInfo("In thread"); + LogDebug("In thread"); RUNNER_ASSERT(!g_foo); RUNNER_ASSERT(g_foo.IsNull()); diff --git a/tests/dao/tests_dao.cpp b/tests/dao/tests_dao.cpp index 73456db..ae3c7cd 100644 --- a/tests/dao/tests_dao.cpp +++ b/tests/dao/tests_dao.cpp @@ -37,7 +37,7 @@ int main (int argc, char *argv[]) WrtDB::WrtDatabase::attachToThreadRW(); CustomHandlerDB::Interface::attachDatabaseRW(); - LogInfo("Starting tests"); + LogDebug("Starting tests"); int status = DPL::Test::TestRunnerSingleton::Instance().ExecTestRunner(argc, argv); diff --git a/tests/dbus/main.cpp b/tests/dbus/main.cpp index d06a4c0..4dfd0b4 100644 --- a/tests/dbus/main.cpp +++ b/tests/dbus/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char *argv[]) { LoopControl::init_loop(argc, argv); - LogInfo("Running tests"); + LogDebug("Running tests"); int status = DPL::Test::TestRunnerSingleton::Instance().ExecTestRunner(argc, argv); diff --git a/tests/event/test_event_support.cpp b/tests/event/test_event_support.cpp index e900e9c..cf7e1c8 100644 --- a/tests/event/test_event_support.cpp +++ b/tests/event/test_event_support.cpp @@ -112,7 +112,7 @@ void OnDelegateTest(const int &k); void OnDelegateTest(const int &k) { - LogInfo("Got delegate call"); + LogDebug("Got delegate call"); g_delegateTest = k; } diff --git a/tests/event/test_ic_delegate.cpp b/tests/event/test_ic_delegate.cpp index 77856f4..cc28b4f 100644 --- a/tests/event/test_ic_delegate.cpp +++ b/tests/event/test_ic_delegate.cpp @@ -511,7 +511,7 @@ class ICReuseTestController : { event.GetArg0() (); //calling intercontext delegate if (++m_reuseCount < ReuseCount) { - LogInfo("[Send] Reuse: " << m_reuseCount); + LogDebug("[Send] Reuse: " << m_reuseCount); DPL::Event::ControllerEventHandler::PostEvent( event); } diff --git a/tests/localizationTagsProvider/Localization_testcases.cpp b/tests/localizationTagsProvider/Localization_testcases.cpp index bd4b003..295ca7c 100644 --- a/tests/localizationTagsProvider/Localization_testcases.cpp +++ b/tests/localizationTagsProvider/Localization_testcases.cpp @@ -30,7 +30,7 @@ RUNNER_TEST_GROUP_INIT(LanguageTagsProvider) RUNNER_TEST(tagsFromSystemLocales) { - LogInfo("Generating tags from system locales"); + LogDebug("Generating tags from system locales"); char* currlocals = vconf_get_str(VCONFKEY_LANGSET); LogDebug("Locales fetched from system settings: " << currlocals); @@ -62,7 +62,7 @@ RUNNER_TEST(tagsFromSystemLocales) RUNNER_TEST(tagsFromGivenLocales) { - LogInfo("Generating tags from given locales"); + LogDebug("Generating tags from given locales"); const char *locales1 = "it_IT.UTF-8", *locales2="en_GB"; @@ -89,7 +89,7 @@ RUNNER_TEST(tagsFromGivenLocales) RUNNER_TEST(tagsFromNullLocales) { - LogInfo("Generating tags when NULL locales given"); + LogDebug("Generating tags when NULL locales given"); LanguageTagsProviderSingleton::Instance().setLanguageTagsFromLocales(NULL); LanguageTags ltlist = LanguageTagsProviderSingleton::Instance().getLanguageTags(); @@ -102,7 +102,7 @@ RUNNER_TEST(tagsFromNullLocales) RUNNER_TEST(tagsFromGivenTagList) { - LogInfo("Copying given tags list"); + LogDebug("Copying given tags list"); LogDebug("Correct full list (with default values)"); LanguageTags correct; @@ -129,7 +129,7 @@ RUNNER_TEST(tagsFromGivenTagList) RUNNER_TEST(tagsFromEmptyList) { - LogInfo("Generating tags when empty tag list given"); + LogDebug("Generating tags when empty tag list given"); LanguageTags input; LanguageTagsProviderSingleton::Instance().setLanguageTags(input); @@ -139,7 +139,7 @@ RUNNER_TEST(tagsFromEmptyList) RUNNER_TEST(defaultWidgetLocale) { - LogInfo("Adding default widget locales to language tags list"); + LogDebug("Adding default widget locales to language tags list"); LanguageTags input; input.push_back(L"de-DE"); diff --git a/tests/localizationTagsProvider/tests_miscunit.cpp b/tests/localizationTagsProvider/tests_miscunit.cpp index ba7a1d8..430cccf 100644 --- a/tests/localizationTagsProvider/tests_miscunit.cpp +++ b/tests/localizationTagsProvider/tests_miscunit.cpp @@ -26,7 +26,7 @@ int main (int argc, char *argv[]) { - LogInfo("Starting miscellaneous unit tests"); + LogDebug("Starting miscellaneous unit tests"); int status = DPL::Test::TestRunnerSingleton::Instance().ExecTestRunner(argc, argv); return status; diff --git a/tests/unused/test_message_queue.cpp b/tests/unused/test_message_queue.cpp index 3322413..09990b7 100644 --- a/tests/unused/test_message_queue.cpp +++ b/tests/unused/test_message_queue.cpp @@ -69,13 +69,13 @@ class CopyThread : m_output(output), m_dataSize(dataSize) { - LogInfo("Thread created"); + LogDebug("Thread created"); } protected: virtual int ThreadEntry() { - LogInfo("Entering copy thread"); + LogDebug("Entering copy thread"); Try { @@ -89,7 +89,7 @@ class CopyThread : return 0; } - LogInfo("Copy finished"); + LogDebug("Copy finished"); return 0; } }; diff --git a/tests/unused/test_shm.cpp b/tests/unused/test_shm.cpp index a5c6046..79b40f6 100644 --- a/tests/unused/test_shm.cpp +++ b/tests/unused/test_shm.cpp @@ -1552,7 +1552,7 @@ RUNNER_TEST(SharedMemory_130_SharedObjectSingleton) // Create and wait for notification. Make sure that the thread/controller 0 // is created first - LogInfo("Creating controllers"); + LogDebug("Creating controllers"); for (size_t i = 0; i < MAX_THREADS; ++i) { controller[i] = new ShmController4(&waitable[i]); Wait(waitable[i]); @@ -1562,12 +1562,12 @@ RUNNER_TEST(SharedMemory_130_SharedObjectSingleton) MTSharedObjectPtr singleton = SharedObjectSingleton::Instance(); for (size_t repeats = 0; repeats < SINGLETON_TEST_REPEATS; ++repeats) { - LogInfo("%%%%%%%%%%%%%%%%%%%%%"); - LogInfo("Iteration " << repeats + 1 << " of " << SINGLETON_TEST_REPEATS); + LogDebug("%%%%%%%%%%%%%%%%%%%%%"); + LogDebug("Iteration " << repeats + 1 << " of " << SINGLETON_TEST_REPEATS); singleton->Clear(); // add listeners - LogInfo("Adding listeners"); + LogDebug("Adding listeners"); for (size_t i = 0; i < MAX_THREADS; ++i) { controller[i]->PostEvent(ShmController4::ADD_LISTENERS); } @@ -1585,31 +1585,31 @@ RUNNER_TEST(SharedMemory_130_SharedObjectSingleton) RUNNER_ASSERT(checkArray[2] == 0); // change - LogInfo("Setting property 0"); + LogDebug("Setting property 0"); sho->SetProperty<0>(1); // wait for confirmations MultipleWait(waitable); // change - LogInfo("Setting property 1"); + LogDebug("Setting property 1"); sho->SetProperty<1>(11); // wait for confirmations MultipleWait(waitable); // change - LogInfo("Setting property 2"); + LogDebug("Setting property 2"); sho->SetProperty<2>('a'); // wait for confirmations MultipleWait(waitable); // change - LogInfo("Setting property 3"); + LogDebug("Setting property 3"); sho->SetProperty<3>(array); // wait for confirmations MultipleWait(waitable); // remove listeners - LogInfo("Removing listeners"); + LogDebug("Removing listeners"); for (size_t i = 0; i < MAX_THREADS; ++i) { controller[i]->PostEvent(ShmController4::REMOVE_LISTENERS); } @@ -1617,7 +1617,7 @@ RUNNER_TEST(SharedMemory_130_SharedObjectSingleton) MultipleWait(waitable); // check if listeners array is empty - LogInfo("Checking listeners"); + LogDebug("Checking listeners"); for (size_t i = 0; i < MAX_THREADS; ++i) { LISTENER_ASSERT(0); LISTENER_ASSERT(1); @@ -1638,7 +1638,7 @@ RUNNER_TEST(SharedMemory_130_SharedObjectSingleton) // Destroy controllers and wait for confirmation. Make sure that // thread/controller 0 is destroyed in the end - LogInfo("Destroying controllers"); + LogDebug("Destroying controllers"); for (int i = MAX_THREADS - 1; i >= 0; --i) { controller[i]->PostEvent(DESTROY_EVENT); Wait(waitable[i]); @@ -1648,7 +1648,7 @@ RUNNER_TEST(SharedMemory_130_SharedObjectSingleton) * This is to properly close all waitable handles opened by * SharedObject in thread 0. */ - LogInfo("Destroying singleton"); + LogDebug("Destroying singleton"); controller[i]->PostEvent(ShmController4::DESTROY_SINGLETON); Wait(waitable[i]); } diff --git a/tests/unused/test_task.cpp b/tests/unused/test_task.cpp index 995f1cb..a885dcd 100644 --- a/tests/unused/test_task.cpp +++ b/tests/unused/test_task.cpp @@ -48,17 +48,17 @@ class MyMultiTask : void StepOne() { - LogInfo("Step one"); + LogDebug("Step one"); } void StepTwo() { - LogInfo("Step two"); + LogDebug("Step two"); } void StepThree() { - LogInfo("Step three"); + LogDebug("Step three"); } public: -- 2.7.4