Changed default log level to info and moved logging statements that we always want...

diff --git a/accelerator/ogl/util/buffer.cpp b/accelerator/ogl/util/buffer.cpp
index 063d5bd1e951e160459a32065dd95d479d443df0..a34ca570e2f4cc7191d1b3e0e04a3d1879be7564 100644 (file)
--- a/accelerator/ogl/util/buffer.cpp
+++ b/accelerator/ogl/util/buffer.cpp
@@ -70,7 +70,7 @@ public:
                        CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info("Failed to allocate buffer."));
                
                if(timer.elapsed() > 0.02)
-                       CASPAR_LOG(debug) << L"[buffer] Performance warning. Buffer allocation blocked: " << timer.elapsed();
+                       CASPAR_LOG(warning) << L"[buffer] Performance warning. Buffer allocation blocked: " << timer.elapsed();
        
                //CASPAR_LOG(trace) << "[buffer] [" << ++(usage_ == buffer::usage::write_only ? g_w_total_count : g_r_total_count) << L"] allocated size:" << size_ << " usage: " << (usage == buffer::usage::write_only ? "write_only" : "read_only");
        }       
@@ -95,7 +95,7 @@ public:
                data_ = (uint8_t*) result;
 
                if(timer.elapsed() > 0.02)
-                       CASPAR_LOG(debug) << L"[buffer] Performance warning. Buffer mapping blocked: " << timer.elapsed();
+                       CASPAR_LOG(warning) << L"[buffer] Performance warning. Buffer mapping blocked: " << timer.elapsed();
 
                GL(glBindBuffer(target_, 0));
                if(!data_)

diff --git a/accelerator/ogl/util/device.cpp b/accelerator/ogl/util/device.cpp
index b0a4a9cb03928c413519c2de1fc9157487a574d4..b1e52ea942ca669f1f43a62041ee25ba65a20f26 100644 (file)
--- a/accelerator/ogl/util/device.cpp
+++ b/accelerator/ogl/util/device.cpp
@@ -168,7 +168,7 @@ struct device::impl : public std::enable_shared_from_this<impl>
                        }, task_priority::high_priority);
                        
                        if(timer.elapsed() > 0.02)
-                               CASPAR_LOG(debug) << L"[ogl-device] Performance warning. Buffer allocation blocked: " << timer.elapsed();
+                               CASPAR_LOG(warning) << L"[ogl-device] Performance warning. Buffer allocation blocked: " << timer.elapsed();
                }
                
                std::weak_ptr<impl> self = shared_from_this(); // buffers can leave the device context, take a hold on life-time.

diff --git a/common/executor.h b/common/executor.h
index f161ccd61912488491da500f17692bc0b71e180c..b81bb0187c464f589b3095a71620189b37ceb899 100644 (file)
--- a/common/executor.h
+++ b/common/executor.h
@@ -81,7 +81,7 @@ public:
        
        ~executor()
        {
-               CASPAR_LOG(trace) << L"Shutting down " << name_;
+               CASPAR_LOG(debug) << L"Shutting down " << name_;
 
                try
                {
@@ -239,7 +239,7 @@ private:
 
                if (!execution_queue_.try_push(priority, function))
                {
-                       CASPAR_LOG(debug) << print() << L" Overflow. Blocking caller.";
+                       CASPAR_LOG(warning) << print() << L" Overflow. Blocking caller.";
                        execution_queue_.push(priority, function);
                }
 

diff --git a/common/log.h b/common/log.h
index 2704e3823b6efc38b71007671ab4004c57ce186a..3deb67f2f4257ebc5d968e5951477717933156f0 100644 (file)
--- a/common/log.h
+++ b/common/log.h
@@ -82,10 +82,15 @@ BOOST_LOG_INLINE_GLOBAL_LOGGER_INIT(logger, caspar_logger)
        catch(...){}
 
 #define CASPAR_LOG_CURRENT_EXCEPTION() try{\
-               CASPAR_LOG(error)  << caspar::u16(boost::current_exception_diagnostic_information()) << L"Caught at (" << caspar::get_thread_info().name << L"):\n" << caspar::get_call_stack();\
+               CASPAR_LOG(error) << caspar::u16(boost::current_exception_diagnostic_information()) << L"Caught at (" << caspar::get_thread_info().name << L"):\n" << caspar::get_call_stack();\
        }\
        catch(...){}
-       
+
+#define CASPAR_LOG_CURRENT_EXCEPTION_AT_LEVEL(lvl) try{\
+               CASPAR_LOG(lvl) << caspar::u16(boost::current_exception_diagnostic_information()) << L"Caught at (" << caspar::get_thread_info().name << L"):\n" << caspar::get_call_stack();\
+       }\
+       catch(...){}
+
 void set_log_level(const std::wstring& lvl);
 
 void print_child(

diff --git a/core/consumer/frame_consumer.cpp b/core/consumer/frame_consumer.cpp
index d25cf336767a3d177ae524bf8b7a45eb7a33b5c5..7601f2e50992d3ee35a2a8fdd363ec9ec7f58de2 100644 (file)
--- a/core/consumer/frame_consumer.cpp
+++ b/core/consumer/frame_consumer.cpp
@@ -114,9 +114,9 @@ public:
                                ensure_gpf_handler_installed_for_thread(u8(L"Destroyer: " + str).c_str());
 
                                if (!consumer->unique())
-                                       CASPAR_LOG(trace) << str << L" Not destroyed on asynchronous destruction thread: " << consumer->use_count();
+                                       CASPAR_LOG(debug) << str << L" Not destroyed on asynchronous destruction thread: " << consumer->use_count();
                                else
-                                       CASPAR_LOG(trace) << str << L" Destroying on asynchronous destruction thread.";
+                                       CASPAR_LOG(debug) << str << L" Destroying on asynchronous destruction thread.";
                        }
                        catch(...){}
 
@@ -149,7 +149,7 @@ public:
        ~print_consumer_proxy()
        {               
                auto str = consumer_->print();
-               CASPAR_LOG(trace) << str << L" Uninitializing.";
+               CASPAR_LOG(debug) << str << L" Uninitializing.";
                consumer_.reset();
                CASPAR_LOG(info) << str << L" Uninitialized.";
        }

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 5040caad0be2c2f5cdca7efbc03011da7ed6071e..33cf01d7e5e98cb2800cc3a37c3c1e38b7e97d5c 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -170,7 +170,7 @@ public:
                {
                        if (input_frame.size() != format_desc_.size)
                        {
-                               CASPAR_LOG(debug) << print() << L" Invalid input frame dimension.";
+                               CASPAR_LOG(warning) << print() << L" Invalid input frame dimension.";
                                return nullptr;
                        }
 

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 94f099c1e9afd278acf2106bdfc59c1f931f885b..42358b0fadc15cf31f5c47c37a52cc4ec35c3437 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -186,7 +186,8 @@ public:
 
                        if (item.channel_layout == audio_channel_layout::invalid())
                        {
-                               CASPAR_LOG(debug) << "[audio_mixer] invalid audio channel layout for item";
+                               CASPAR_LOG(warning) << "[audio_mixer] invalid audio channel layout for item";
+                               next_audio_streams[tag].remapping_failed = true;
                                continue;
                        }
 

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 16528bb4cd8ee7c830974a39dc9b94500947c7c1..948f1f81e9a4ec284309e823aca51b58c5a6d9ab 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -260,9 +260,9 @@ public:
                                ensure_gpf_handler_installed_for_thread(u8(L"Destroyer: " + str).c_str());
 
                                if (!producer->unique())
-                                       CASPAR_LOG(trace) << str << L" Not destroyed on asynchronous destruction thread: " << producer->use_count();
+                                       CASPAR_LOG(debug) << str << L" Not destroyed on asynchronous destruction thread: " << producer->use_count();
                                else
-                                       CASPAR_LOG(trace) << str << L" Destroying on asynchronous destruction thread.";
+                                       CASPAR_LOG(debug) << str << L" Destroying on asynchronous destruction thread.";
                        }
                        catch(...){}
                        

diff --git a/core/thumbnail_generator.cpp b/core/thumbnail_generator.cpp
index 38c3970e7dc4acf08e37ee10b29cb606869e103a..aded7f7fe0b36659a5bc9e34248702455ab9ca6e 100644 (file)
--- a/core/thumbnail_generator.cpp
+++ b/core/thumbnail_generator.cpp
@@ -259,13 +259,14 @@ public:
                        }
                        catch (...)
                        {
-                               CASPAR_LOG(debug) << L"Thumbnail producer failed to initialize for " << media_file_with_extension;
+                               CASPAR_LOG_CURRENT_EXCEPTION_AT_LEVEL(debug);
+                               CASPAR_LOG(info) << L"Thumbnail producer failed to initialize for " << media_file_with_extension << L". Turn on log level debug to see more information.";
                                return;
                        }
 
                        if (producer == frame_producer::empty())
                        {
-                               CASPAR_LOG(trace) << L"No appropriate thumbnail producer found for " << media_file_with_extension;
+                               CASPAR_LOG(debug) << L"No appropriate thumbnail producer found for " << media_file_with_extension;
                                return;
                        }
 
@@ -290,7 +291,8 @@ public:
                        }
                        catch (...)
                        {
-                               CASPAR_LOG(debug) << L"Thumbnail producer failed to create thumbnail for " << media_file_with_extension;
+                               CASPAR_LOG_CURRENT_EXCEPTION_AT_LEVEL(debug);
+                               CASPAR_LOG(info) << L"Thumbnail producer failed to create thumbnail for " << media_file_with_extension << L". Turn on log level debug to see more information.";
                                return;
                        }
 
@@ -322,7 +324,7 @@ public:
                        try
                        {
                                boost::filesystem::last_write_time(png_file, boost::filesystem::last_write_time(file));
-                               CASPAR_LOG(debug) << L"Generated thumbnail for " << media_file_with_extension;
+                               CASPAR_LOG(info) << L"Generated thumbnail for " << media_file_with_extension;
                        }
                        catch (...)
                        {

diff --git a/modules/ffmpeg/audio_channel_remapper.cpp b/modules/ffmpeg/audio_channel_remapper.cpp
index 54de4386d5a336e808bd5e7569f6260c22f71f79..f003a7ada1c5ddf320dd84d937a98baa8d429917 100644 (file)
--- a/modules/ffmpeg/audio_channel_remapper.cpp
+++ b/modules/ffmpeg/audio_channel_remapper.cpp
@@ -79,13 +79,13 @@ std::wstring generate_pan_filter_str(
                        for (int i = 0; i < output.num_channels; ++i)
                                result << L"|c" << i << L"=c" << i;
 
-                       CASPAR_LOG(trace) << "[audio_channel_remapper] Passthru " << input.num_channels << " channels into " << output.num_channels;
+                       CASPAR_LOG(debug) << "[audio_channel_remapper] Passthru " << input.num_channels << " channels into " << output.num_channels;
 
                        return result.str();
                }
        }
 
-       CASPAR_LOG(trace) << L"[audio_channel_remapper] Using mix config: " << *mix_config;
+       CASPAR_LOG(debug) << L"[audio_channel_remapper] Using mix config: " << *mix_config;
 
        // Split on | to find the output sections
        std::vector<std::wstring> output_sections;
@@ -138,15 +138,15 @@ struct audio_channel_remapper::impl
                if (output_layout_ == audio_channel_layout::invalid())
                        CASPAR_THROW_EXCEPTION(invalid_argument() << msg_info(L"Output audio channel layout is invalid"));
 
-               CASPAR_LOG(trace) << L"[audio_channel_remapper] Input:  " << input_layout_.print();
-               CASPAR_LOG(trace) << L"[audio_channel_remapper] Output: " << output_layout_.print();
+               CASPAR_LOG(debug) << L"[audio_channel_remapper] Input:  " << input_layout_.print();
+               CASPAR_LOG(debug) << L"[audio_channel_remapper] Output: " << output_layout_.print();
 
                if (!the_same_layouts_)
                {
                        auto mix_config = mix_repo->get_config(input_layout_.type, output_layout_.type);
                        auto pan_filter = u8(generate_pan_filter_str(input_layout_, output_layout_, mix_config));
 
-                       CASPAR_LOG(trace) << "[audio_channel_remapper] Using audio filter: " << pan_filter;
+                       CASPAR_LOG(debug) << "[audio_channel_remapper] Using audio filter: " << pan_filter;
                        auto logging_disabled = ffmpeg::temporary_disable_logging_for_thread(true);
                        filter_.reset(new ffmpeg::audio_filter(
                                        boost::rational<int>(1, 1),
@@ -159,7 +159,7 @@ struct audio_channel_remapper::impl
                                        pan_filter));
                }
                else
-                       CASPAR_LOG(trace) << "[audio_channel_remapper] No remapping/mixing needed because the input and output layout is equal.";
+                       CASPAR_LOG(debug) << "[audio_channel_remapper] No remapping/mixing needed because the input and output layout is equal.";
        }
 
        audio_buffer mix_and_rearrange(audio_buffer input)

diff --git a/modules/flash/flash.cpp b/modules/flash/flash.cpp
index ed4b88434ad9f37e5af78907f20d26350d72977f..acf168463fc0fe50c8313a65c286fa738a3a9572 100644 (file)
--- a/modules/flash/flash.cpp
+++ b/modules/flash/flash.cpp
@@ -79,7 +79,7 @@ public:
                filename = find_template(filename);
 
                auto str = (boost::wformat(L"<invoke name=\"Add\" returntype=\"xml\"><arguments><number>%1%</number><string>%2%</string>%3%<string>%4%</string><string><![CDATA[%5%]]></string></arguments></invoke>") % layer % filename % (play_on_load ? L"<true/>" : L"<false/>") % label % data).str();
-               CASPAR_LOG(info) << flash_producer_->print() << " Invoking add-command: " << str;
+               CASPAR_LOG(debug) << flash_producer_->print() << " Invoking add-command: " << str;
                std::vector<std::wstring> params;
                params.push_back(std::move(str));
                flash_producer_->call(std::move(params)).get();
@@ -88,7 +88,7 @@ public:
        void remove(int layer) override
        {
                auto str = (boost::wformat(L"<invoke name=\"Delete\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array></arguments></invoke>") % layer).str();
-               CASPAR_LOG(info) << flash_producer_->print() << " Invoking remove-command: " << str;
+               CASPAR_LOG(debug) << flash_producer_->print() << " Invoking remove-command: " << str;
                std::vector<std::wstring> params;
                params.push_back(std::move(str));
                flash_producer_->call(std::move(params));
@@ -97,7 +97,7 @@ public:
        void play(int layer) override
        {
                auto str = (boost::wformat(L"<invoke name=\"Play\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array></arguments></invoke>") % layer).str();
-               CASPAR_LOG(info) << flash_producer_->print() << " Invoking play-command: " << str;
+               CASPAR_LOG(debug) << flash_producer_->print() << " Invoking play-command: " << str;
                std::vector<std::wstring> params;
                params.push_back(std::move(str));
                flash_producer_->call(std::move(params));
@@ -106,7 +106,7 @@ public:
        void stop(int layer, unsigned int) override
        {
                auto str = (boost::wformat(L"<invoke name=\"Stop\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array><number>0</number></arguments></invoke>") % layer).str();
-               CASPAR_LOG(info) << flash_producer_->print() << " Invoking stop-command: " << str;
+               CASPAR_LOG(debug) << flash_producer_->print() << " Invoking stop-command: " << str;
                std::vector<std::wstring> params;
                params.push_back(std::move(str));
                flash_producer_->call(std::move(params));
@@ -115,7 +115,7 @@ public:
        void next(int layer) override
        {
                auto str = (boost::wformat(L"<invoke name=\"Next\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array></arguments></invoke>") % layer).str();
-               CASPAR_LOG(info) << flash_producer_->print() << " Invoking next-command: " << str;
+               CASPAR_LOG(debug) << flash_producer_->print() << " Invoking next-command: " << str;
                std::vector<std::wstring> params;
                params.push_back(std::move(str));
                flash_producer_->call(std::move(params));
@@ -124,7 +124,7 @@ public:
        void update(int layer, const std::wstring& data) override
        {
                auto str = (boost::wformat(L"<invoke name=\"SetData\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array><string><![CDATA[%2%]]></string></arguments></invoke>") % layer % data).str();
-               CASPAR_LOG(info) << flash_producer_->print() << " Invoking update-command: " << str;
+               CASPAR_LOG(debug) << flash_producer_->print() << " Invoking update-command: " << str;
                std::vector<std::wstring> params;
                params.push_back(std::move(str));
                flash_producer_->call(std::move(params));
@@ -133,7 +133,7 @@ public:
        std::wstring invoke(int layer, const std::wstring& label) override
        {
                auto str = (boost::wformat(L"<invoke name=\"Invoke\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array><string>%2%</string></arguments></invoke>") % layer % label).str();
-               CASPAR_LOG(info) << flash_producer_->print() << " Invoking invoke-command: " << str;
+               CASPAR_LOG(debug) << flash_producer_->print() << " Invoking invoke-command: " << str;
                std::vector<std::wstring> params;
                params.push_back(std::move(str));
                // TODO: because of std::async deferred timed waiting does not work so for now we have to block
@@ -143,7 +143,7 @@ public:
        std::wstring description(int layer) override
        {
                auto str = (boost::wformat(L"<invoke name=\"GetDescription\" returntype=\"xml\"><arguments><array><property id=\"0\"><number>%1%</number></property></array></arguments></invoke>") % layer).str();
-               CASPAR_LOG(info) << flash_producer_->print() << " Invoking description-command: " << str;
+               CASPAR_LOG(debug) << flash_producer_->print() << " Invoking description-command: " << str;
                std::vector<std::wstring> params;
                params.push_back(std::move(str));
                // TODO: because of std::async deferred timed waiting does not work so for now we have to block
@@ -153,7 +153,7 @@ public:
        std::wstring template_host_info() override
        {
                auto str = (boost::wformat(L"<invoke name=\"GetInfo\" returntype=\"xml\"><arguments></arguments></invoke>")).str();
-               CASPAR_LOG(info) << flash_producer_->print() << " Invoking info-command: " << str;
+               CASPAR_LOG(debug) << flash_producer_->print() << " Invoking info-command: " << str;
                std::vector<std::wstring> params;
                params.push_back(std::move(str));
                // TODO: because of std::async deferred timed waiting does not work so for now we have to block

diff --git a/modules/flash/producer/FlashAxContainer.cpp b/modules/flash/producer/FlashAxContainer.cpp
index 33372928029ab4828c07f9ab7d40e0c7cb739c55..c0da13a5be2295ad814c71e8971215e9635918f7 100644 (file)
--- a/modules/flash/producer/FlashAxContainer.cpp
+++ b/modules/flash/producer/FlashAxContainer.cpp
@@ -611,12 +611,12 @@ void STDMETHODCALLTYPE FlashAxContainer::OnFlashCall(BSTR request)
        }
        else if(str.find(L"OnCommand") != std::wstring::npos) {
                //this is how templatehost 1.8 reports that a command has been received
-               CASPAR_LOG(debug)  << print_()  << L" [command]      " << str;
+               CASPAR_LOG(info)  << print_()  << L" [command]      " << str;
                bCallSuccessful_ = true;
        }
        else if(str.find(L"Activity") != std::wstring::npos)
        {
-               CASPAR_LOG(debug) << print_() << L" [activity]     " << str;
+               CASPAR_LOG(info) << print_() << L" [activity]     " << str;
 
                //this is how templatehost 1.7 reports that a command has been received
                if(str.find(L"Command recieved") != std::wstring::npos)
@@ -640,7 +640,7 @@ void STDMETHODCALLTYPE FlashAxContainer::OnFlashCall(BSTR request)
        }
        else if(str.find(L"IsEmpty") != std::wstring::npos)
        {
-               CASPAR_LOG(trace) << print_() << L" Empty.";
+               CASPAR_LOG(debug) << print_() << L" Empty.";
                ATLTRACE(_T("ShockwaveFlash::IsEmpty\n"));
                bIsEmpty_ = true;
        }

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 2f7aaea8d7b600b020220b8818e4cb8ac932dbae..4066ecea92e353359d9149432aa83473e13647c4 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -262,7 +262,7 @@ public:
        {               
                std::wstring result;
 
-               CASPAR_LOG(trace) << print() << " Call: " << param;
+               CASPAR_LOG(debug) << print() << " Call: " << param;
 
                if(!ax_->FlashCall(param, result))
                        CASPAR_LOG(warning) << print() << L" Flash call failed:" << param;//CASPAR_THROW_EXCEPTION(invalid_operation() << msg_info("Flash function call failed.") << arg_name_info("param") << arg_value_info(narrow(param)));

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index 6be44ab6f7c187f82b0ea1c60da8079a295fbe4c..92f805145d4d47f2d6146838a9d96447b23b1b55 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -89,7 +89,7 @@ struct image_producer : public core::frame_producer_base
                load(load_image(description_));
 
                if (thumbnail_mode)
-                       CASPAR_LOG(trace) << print() << L" Initialized";
+                       CASPAR_LOG(debug) << print() << L" Initialized";
                else
                        CASPAR_LOG(info) << print() << L" Initialized";
        }

diff --git a/modules/newtek/util/air_send.cpp b/modules/newtek/util/air_send.cpp
index 9d0a459d7fb1f8b9e16f94c73592fdcc5ccb20f4..f81d5a0817c99f202200b60c741fa30b69098f9f 100644 (file)
--- a/modules/newtek/util/air_send.cpp
+++ b/modules/newtek/util/air_send.cpp
@@ -64,7 +64,7 @@ std::shared_ptr<void> load_library()
 
        GetModuleFileNameW(module, actualFilename, sizeof(actualFilename));
 
-       CASPAR_LOG(debug) << L"Loaded " << actualFilename;
+       CASPAR_LOG(info) << L"Loaded " << actualFilename;
 
        create = reinterpret_cast<decltype(create)>(
                        GetProcAddress(module, "AirSend_Create"));

diff --git a/modules/psd/util/pdf_reader.cpp b/modules/psd/util/pdf_reader.cpp
index fb5d784328dfdc7c48adb450c04aebdd86ac20b2..3cb9fa2433e7106bfc49e5a05fcf55b88773f9a0 100644 (file)
--- a/modules/psd/util/pdf_reader.cpp
+++ b/modules/psd/util/pdf_reader.cpp
@@ -83,7 +83,7 @@ struct pdf_context
        void set_name(const std::string& str)
        {
                name.assign(str.begin(), str.end());
-               CASPAR_LOG(trace) << get_indent() << name;
+               CASPAR_LOG(debug) << get_indent() << name;
        }
 
        void add_char(std::uint8_t c)
@@ -109,7 +109,7 @@ struct pdf_context
 
        void set_value()
        {
-               CASPAR_LOG(trace) << get_indent() << value;
+               CASPAR_LOG(debug) << get_indent() << value;
 
                stack.back()->push_back(std::make_pair(name, Ptree(value)));
                clear_state();

diff --git a/protocol/amcp/AMCPCommandQueue.cpp b/protocol/amcp/AMCPCommandQueue.cpp
index ea69ccb832cbe6f8e2a6f196cc09d942712645f5..59198b969ad5456c24f1a83cfa334464ff8b68de 100644 (file)
--- a/protocol/amcp/AMCPCommandQueue.cpp
+++ b/protocol/amcp/AMCPCommandQueue.cpp
@@ -104,29 +104,32 @@ void AMCPCommandQueue::AddCommand(AMCPCommand::ptr_type pCurrentCommand)
                                }
 
                                if (pCurrentCommand->Execute())
-                                       CASPAR_LOG(debug) << "Executed command (" << timer.elapsed() << "s): " << print;
+                                       CASPAR_LOG(info) << "Executed command (" << timer.elapsed() << "s): " << print;
                                else
                                        CASPAR_LOG(warning) << "Failed to execute command: " << print;
                        }
                        catch (file_not_found&)
                        {
+                               CASPAR_LOG_CURRENT_EXCEPTION_AT_LEVEL(debug);
                                CASPAR_LOG(error) << L"File not found. No match found for parameters. Check syntax.";
                                pCurrentCommand->SetReplyString(L"404 " + pCurrentCommand->print() + L" FAILED\r\n");
                        }
                        catch (const user_error& e)
                        {
+                               CASPAR_LOG_CURRENT_EXCEPTION_AT_LEVEL(debug);
                                CASPAR_LOG(error) << *boost::get_error_info<msg_info_t>(e) << ". Check syntax.";
                                pCurrentCommand->SetReplyString(L"403 " + pCurrentCommand->print() + L" FAILED\r\n");
                        }
                        catch (std::out_of_range&)
                        {
+                               CASPAR_LOG_CURRENT_EXCEPTION_AT_LEVEL(debug);
                                CASPAR_LOG(error) << L"Missing parameter. Check syntax.";
                                pCurrentCommand->SetReplyString(L"402 " + pCurrentCommand->print() + L" FAILED\r\n");
                        }
                        catch (...)
                        {
                                CASPAR_LOG_CURRENT_EXCEPTION();
-                               CASPAR_LOG(warning) << "Failed to execute command:" << pCurrentCommand->print();
+                               CASPAR_LOG(error) << "Failed to execute command:" << pCurrentCommand->print();
                                pCurrentCommand->SetReplyString(L"501 " + pCurrentCommand->print() + L" FAILED\r\n");
                        }
                                

diff --git a/protocol/cii/CIIProtocolStrategy.cpp b/protocol/cii/CIIProtocolStrategy.cpp
index 86a18f794d86ca246c6298dca01c884fc3aacfac..3efdfe3114f44a0a32dbb6cd5fe36972a8f070c1 100644 (file)
--- a/protocol/cii/CIIProtocolStrategy.cpp
+++ b/protocol/cii/CIIProtocolStrategy.cpp
@@ -229,7 +229,7 @@ spl::shared_ptr<core::frame_producer> CIIProtocolStrategy::GetPreparedTemplate(c
 
        TitleList::iterator it = std::find(titles_.begin(), titles_.end(), titleName);
        if(it != titles_.end()) {
-               CASPAR_LOG(debug) << L"Found title with name " << it->titleName;
+               CASPAR_LOG(info) << L"Found title with name " << it->titleName;
                result = (*it).pframe_producer;
        }
        else 
@@ -240,7 +240,7 @@ spl::shared_ptr<core::frame_producer> CIIProtocolStrategy::GetPreparedTemplate(c
 
 void CIIProtocolStrategy::PutPreparedTemplate(const std::wstring& titleName, const spl::shared_ptr<core::frame_producer>& pFP)
 {
-       CASPAR_LOG(debug) << L"Saved title with name " << titleName;
+       CASPAR_LOG(info) << L"Saved title with name " << titleName;
 
        TitleList::iterator it = std::find(titles_.begin(), titles_.end(), titleName);
        if(it != titles_.end()) {

diff --git a/protocol/clk/CLKProtocolStrategy.cpp b/protocol/clk/CLKProtocolStrategy.cpp
index 6523bedc3846080655116168403af84f1b4caa9d..866a0bc3922e035f3471576218be379d82a8e4fa 100644 (file)
--- a/protocol/clk/CLKProtocolStrategy.cpp
+++ b/protocol/clk/CLKProtocolStrategy.cpp
@@ -117,7 +117,7 @@ public:
                                        if (!command_processor_.handle(command_name_, parameters_))
                                                CASPAR_LOG(error) << "CLK: Unknown command: " << command_name_;
                                        else
-                                               CASPAR_LOG(debug) << L"CLK: Executed valid command: " 
+                                               CASPAR_LOG(info) << L"CLK: Executed valid command: " 
                                                        << currentCommandString_.str();
                                } 
                                catch (...)

diff --git a/protocol/clk/clk_commands.cpp b/protocol/clk/clk_commands.cpp
index 8c10362134250186109764a237681a2ad36e0656..5832f9feab49e1a70e567d2f6cc8b667daab95a9 100644 (file)
--- a/protocol/clk/clk_commands.cpp
+++ b/protocol/clk/clk_commands.cpp
@@ -72,7 +72,7 @@ public:
                        cg_registry_->get_proxy(channel_, core::cg_proxy::DEFAULT_LAYER)->update(0, data);\r
                }\r
                                \r
-               CASPAR_LOG(debug) << L"CLK: Clockdata sent: " << data;\r
+               CASPAR_LOG(info) << L"CLK: Clockdata sent: " << data;\r
        }\r
 \r
        void reset()\r

diff --git a/protocol/util/AsyncEventServer.cpp b/protocol/util/AsyncEventServer.cpp
index 15e473760eeb623e507d247e08068a81b37e7f5a..8348c56b97f4754d7bbaf3ddd992643e6b7b77c9 100644 (file)
--- a/protocol/util/AsyncEventServer.cpp
+++ b/protocol/util/AsyncEventServer.cpp
@@ -130,7 +130,7 @@ public:
 
        ~connection()
        {
-               CASPAR_LOG(trace) << print() << L" connection destroyed.";
+               CASPAR_LOG(debug) << print() << L" connection destroyed.";
        }
 
        std::wstring print() const

diff --git a/protocol/util/strategy_adapters.cpp b/protocol/util/strategy_adapters.cpp
index a1f80b7f80e285e68ae26735365727764d3b0416..ce4b4e2cbcd7920fc4b0e71b035e728efaa19537 100644 (file)
--- a/protocol/util/strategy_adapters.cpp
+++ b/protocol/util/strategy_adapters.cpp
@@ -118,47 +118,6 @@ protocol_strategy<char>::ptr to_unicode_adapter_factory::create(
        return spl::make_shared<to_unicode_adapter>(codepage_, unicode_strategy_factory_->create(client));\r
 }\r
 \r
-/*class legacy_client_info : public ClientInfo\r
-{\r
-       client_connection<wchar_t>::ptr client_connection_;\r
-public:\r
-       legacy_client_info(const client_connection<wchar_t>::ptr& client_connection)\r
-               : client_connection_(client_connection)\r
-       {\r
-               CASPAR_LOG(info) << "legacy_client_info created.";\r
-       }\r
-\r
-       ~legacy_client_info()\r
-       {\r
-               CASPAR_LOG(info) << "legacy_client_info destroyed.";\r
-       }\r
-\r
-\r
-       virtual void Disconnect()\r
-       {\r
-               client_connection_->disconnect();\r
-       }\r
-\r
-       virtual void Send(const std::wstring& data)\r
-       {\r
-               client_connection_->send(std::wstring(data));\r
-       }\r
-\r
-       virtual std::wstring print() const \r
-       {\r
-               return client_connection_->print();\r
-       }\r
-       virtual void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound)\r
-       {\r
-               client_connection_->add_lifecycle_bound_object(key, lifecycle_bound);\r
-       }\r
-       virtual std::shared_ptr<void> remove_lifecycle_bound_object(const std::wstring& key)\r
-       {\r
-               return client_connection_->remove_lifecycle_bound_object(key);\r
-       }\r
-\r
-};*/\r
-\r
 class legacy_strategy_adapter : public protocol_strategy<wchar_t>\r
 {\r
        ProtocolStrategyPtr strategy_;\r

diff --git a/shell/main.cpp b/shell/main.cpp
index 3242cc01e2d4d59ae887327f0a34cdba048700ff..d5decb68c061c2bb4955192515ac3378da237de1 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -295,7 +295,7 @@ int main(int argc, char** argv)
 
                env::configure(config_file_name);
 
-               log::set_log_level(env::properties().get(L"configuration.log-level", L"debug"));
+               log::set_log_level(env::properties().get(L"configuration.log-level", L"info"));
 
                if (env::properties().get(L"configuration.debugging.remote", false))
                        wait_for_remote_debugging();