<table><tr><td style="">dfaure added inline comments.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D25458">View Revision</a></tr></table><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D25458#inline-143818">View Inline</a><span style="color: #4b4d51; font-weight: bold;">setup.cpp:98</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">qCritical</span><span class="p">()</span> <span style="color: #aa2211"><<</span> <span class="n">job</span><span style="color: #aa2211">-></span><span class="n">errorString</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">qCritical</span><span class="p">()</span> <span style="color: #aa2211"><<</span> <span class="bright"></span><span style="color: #766510"><span class="bright">"Failed to create agent:"</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright"><<</span></span><span class="bright"> </span><span class="n">job</span><span style="color: #aa2211">-></span><span class="n">errorString</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">setupFailed</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">return</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">here you call only setupFailed....</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D25458#inline-143821">View Inline</a><span style="color: #4b4d51; font-weight: bold;">setup.cpp:123</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">qCritical</span><span class="p">()</span> <span style="color: #aa2211"><<</span> <span class="n">job</span><span style="color: #aa2211">-></span><span class="n">errorString</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">setupFailed</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">... while here you call <tt style="background: #ebebeb; font-size: 13px;">setupFailed</tt> followed by <tt style="background: #ebebeb; font-size: 13px;">checkSetupDone</tt>.</p>
<p style="padding: 0; margin: 8px;">How about always calling both (on error) so that you can remove the if+shutdown in setupFailed?<br />
And then <tt style="background: #ebebeb; font-size: 13px;">setupFailed</tt> can go away and you can just do <tt style="background: #ebebeb; font-size: 13px;">mExitCode = 1;</tt> in both places where you call <tt style="background: #ebebeb; font-size: 13px;">setupFailed</tt> currently.</p>
<p style="padding: 0; margin: 8px;">IOW this means turning lines 99-100 into <tt style="background: #ebebeb; font-size: 13px;">} else {</tt> so that <tt style="background: #ebebeb; font-size: 13px;">checkSetupDone()</tt> is called in all cases.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D25458#inline-143817">View Inline</a><span style="color: #4b4d51; font-weight: bold;">agentmanager.cpp:620</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span style="color: #74777d"><span class="bright">//</span>qCDebug(AKONADICONTROL_LOG) << "Service " << name << " owner changed from " << oldOwner << " to " << newOwner;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">qCDebug</span><span class="p">(</span><span class="n">AKONADICONTROL_LOG</span><span class="p">)</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"Service "</span> <span style="color: #aa2211"><<</span> <span class="n">name</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">" owner changed from "</span> <span style="color: #aa2211"><<</span> <span class="n">oldOwner</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">" to "</span> <span style="color: #aa2211"><<</span> <span class="n">newOwner</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">(too many spaces in the string constants here)</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D25458#inline-143822">View Inline</a><span style="color: #4b4d51; font-weight: bold;">agentmanager.cpp:671</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">mAgentInstances</span><span class="p">.</span><span class="n">value</span><span class="p">(</span><span class="n">service</span><span style="color: #aa2211">-></span><span class="n">serviceName<span class="bright"></span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">-></span></span><span class="bright"></span><span class="n"><span class="bright">obtainResourceInterface</span></span><span class="bright"></span><span class="p"><span class="bright">(</span>);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">const</span></span><span class="bright"> </span><span class="n"><span class="bright">AgentInstance</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">::</span></span><span class="bright"></span><span class="n"><span class="bright">Ptr</span></span><span class="bright"> </span><span class="n"><span class="bright">instance</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">=</span></span><span class="bright"> </span><span class="n">mAgentInstances</span><span class="p">.</span><span class="n">value</span><span class="p">(</span><span class="n">service</span><span style="color: #aa2211">-></span><span class="n">serviceName</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">const</span> <span style="color: #aa4000">bool</span> <span class="n">restarting</span> <span style="color: #aa2211">=</span> <span class="n">instance</span><span style="color: #aa2211">-></span><span class="n">hasResourceInterface</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">instance</span><span style="color: #aa2211">-></span><span class="n">obtainResourceInterface</span><span class="p">())</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I admit I don't fully understand the logic here.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R165 Akonadi </div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D25458">https://phabricator.kde.org/D25458</a></div></div><br /><div><strong>To: </strong>dvratil, dfaure<br /><strong>Cc: </strong>kde-pim, fbampaloukas, dcaliste, dvasin, rodsevich, winterz, vkrause, mlaurent, knauss, dvratil<br /></div>