Merge lp:~jamesh/thumbnailer/bug-1467751 into lp:thumbnailer/devel

[James Henstridge]

Set finish_time within the Handler::sendThumbnail and sendError methods so it is guaranteed to be set before the finished signal is emitted.

Set finish_time within the Handler::sendThumbnail and sendError methods so it is guaranteed to be set before the finished signal is emitted.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/172/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-wily-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-wily-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-wily-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-wily-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-ci/172/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-ci/321/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-wily-amd64-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-wily-armhf-ci/132
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-wily-armhf-ci/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-wily-i386-ci/130

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-devel-ci/321/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

This is a big improvement, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-autolanding/169/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-wily-amd64-autolanding/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-wily-armhf-autolanding/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-wily-i386-autolanding/71/console

review: Needs Fixing (continuous-integration)

[lp:~jamesh/thumbnailer/bug-1467751]

233. By James Henstridge on 2015-06-23

Merge from devel, fixing conflicts

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/service/handler.cpp'
--- src/service/handler.cpp	2015-06-22 10:18:13 +0000
+++ src/service/handler.cpp	2015-06-23 08:34:17 +0000
@@ -252,8 +252,6 @@
 
 void Handler::checkFinished()
 {
-    p->finish_time = chrono::system_clock::now();     // Set finish_time in case something below throws.
-
     if (p->cancelled)
     {
         return;
@@ -281,8 +279,6 @@
     if (fd_error.fd.isValid())
     {
         sendThumbnail(fd_error.fd);
-        // Set time again, because sending the thumbnail could take a while.
-        p->finish_time = chrono::system_clock::now();
         return;
     }
 
@@ -297,14 +293,12 @@
         // LCOV_EXCL_START
         catch (std::exception const& e)
         {
-            p->finish_time = chrono::system_clock::now();
             sendError("Handler::checkFinished(): download error: " + details() + e.what());
         }
         // LCOV_EXCL_STOP
         return;
     }
 
-    p->finish_time = chrono::system_clock::now();
     sendError("Handler::check_finished(): no artwork for " + details() + ": " + status());
 }
 
@@ -350,8 +344,6 @@
 
 void Handler::createFinished()
 {
-    // Set finish_time in case something below throws.
-    p->finish_time = chrono::system_clock::now();
     if (p->cancelled)
     {
         return;
@@ -382,12 +374,12 @@
     {
         sendError("Handler::createFinished(): invalid file descriptor for " + details());  // LCOV_EXCL_LINE
     }
-    p->finish_time = chrono::system_clock::now();
 }
 
 void Handler::sendThumbnail(QDBusUnixFileDescriptor const& unix_fd)
 {
     p->bus.send(p->message.createReply(QVariant::fromValue(unix_fd)));
+    p->finish_time = chrono::system_clock::now();
     Q_EMIT finished();
 }
 
@@ -398,6 +390,7 @@
         qWarning() << error;
     }
     p->bus.send(p->message.createErrorReply(ART_ERROR, error));
+    p->finish_time = chrono::system_clock::now();
     Q_EMIT finished();
 }