Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / cinema_kdms.cc

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index d7495e9ac2cab7217539071f96ad11038e5b3de1..f76c96283710cc7b4bd0e3fea085a29d0d15c3bd 100644 (file)
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -135,9 +136,9 @@ CinemaKDMs::email (
                i.make_zip_file (film_name, zip_file);
 
                string subject = config->kdm_subject();
-               SafeStringStream start;
+               locked_stringstream start;
                start << from.date() << " " << from.time_of_day();
-               SafeStringStream end;
+               locked_stringstream end;
                end << to.date() << " " << to.time_of_day();
                boost::algorithm::replace_all (subject, "$CPL_NAME", cpl_name);
                boost::algorithm::replace_all (subject, "$START_TIME", start.str ());
@@ -150,7 +151,7 @@ CinemaKDMs::email (
                boost::algorithm::replace_all (body, "$END_TIME", end.str ());
                boost::algorithm::replace_all (body, "$CINEMA_NAME", i.cinema->name);
 
-               SafeStringStream screens;
+               locked_stringstream screens;
                BOOST_FOREACH (ScreenKDM const & j, i.screen_kdms) {
                        screens << j.screen->name << ", ";
                }
@@ -174,12 +175,18 @@ CinemaKDMs::email (
                        email.send (c->mail_server(), c->mail_port(), c->mail_user(), c->mail_password());
                } catch (...) {
                        if (log) {
+                               log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
+                               log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL);
+                               log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL);
                                log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL);
                        }
                        throw;
                }
 
                if (log) {
+                       log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
+                       log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL);
+                       log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL);
                        log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL);
                }
        }