<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
</head>
<body>
<style type="text/css">
img {
max-width: 100%; height: auto;
}
</style>
<div class="content">
<h3>
Gary E. Miller pushed to branch master
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/f96c2d19257ad9ecfab5a24466360334e32fcf9c">f96c2d19</a></strong>
<div>
<span>by James Browning</span>
<i>at 2017-01-20T20:31:25-08:00</i>
</div>
<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Change smartctl-temp-log
* Print device node path instead of uninformative 'SMART'
* Grab the 8th field instead of the 1st to provide real temp not arbitrary number
Signed-off-by: Gary E. Miller <gem@rellim.com>
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#d05f41a7313c77d1476b6d30832ee84fe66376bc">
contrib/smartctl-temp-log
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="d05f41a7313c77d1476b6d30832ee84fe66376bc">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/f96c2d19257ad9ecfab5a24466360334e32fcf9c#d05f41a7313c77d1476b6d30832ee84fe66376bc"><strong>contrib/smartctl-temp-log</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; font-family: monospace; font-size: 12px" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.6">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="70" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="70" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -70,7 +70,7 @@ except OSError as e:</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="70" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
70
</td>
<td class="diff-line-num new_line" data-linenumber="70" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
70
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC70" class="line"><span class="n" style="color: #333">lines</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">output</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">split</span><span class="p">(</span><span class="s" style="color: #d14">'</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">'</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="71" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
71
</td>
<td class="diff-line-num new_line" data-linenumber="71" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
71
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC71" class="line"></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="72" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
72
</td>
<td class="diff-line-num new_line" data-linenumber="72" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
72
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC72" class="line"><span class="c" style="color: #998; font-style: italic"># this regex matches temperature output lines from 'sensors -u'</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" style="line-height: 1.6">
<td class="diff-line-num old old_line" data-linenumber="73" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
73
</td>
<td class="diff-line-num new_line old" data-linenumber="73" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC73" class="line"><span class="n" style="color: #333">pat</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">re</span><span class="o" style="font-weight: bold">.</span><span class="nb" style="color: #0086b3">compile</span><span class="p">(</span><span class="s" style="color: #d14">'194 Temperature_Celsius</span><span class="err" style="background: #e3d2d2; color: #a61717">\</span><span class="s" style="color: #d14">s+</span><span class="err" style="background: #e3d2d2; color: #a61717">\</span><span class="s" style="color: #d14">S+</span><span class="err" style="background: #e3d2d2; color: #a61717">\</span><span class="s" style="color: #d14">s+<span class="idiff left">(</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">d+)</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff right">s+</span>'</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="74" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="73" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
73
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC73" class="line"><span class="n" style="color: #333">pat</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">re</span><span class="o" style="font-weight: bold">.</span><span class="nb" style="color: #0086b3">compile</span><span class="p">(</span><span class="s" style="color: #d14">'194 Temperature_Celsius</span><span class="err" style="background: #e3d2d2; color: #a61717">\</span><span class="s" style="color: #d14">s+</span><span class="err" style="background: #e3d2d2; color: #a61717">\</span><span class="s" style="color: #d14">S+</span><span class="err" style="background: #e3d2d2; color: #a61717">\</span><span class="s" style="color: #d14">s+</span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff left">\</span></span><span class="s" style="color: #d14"><span class="idiff">d+</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">s+</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">d+</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">s+</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">d+</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">s+</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">S+</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">s+</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">S+</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">s+</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">S+</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff">s+(</span></span><span class="err" style="background: #e3d2d2; color: #a61717"><span class="idiff">\</span></span><span class="s" style="color: #d14"><span class="idiff right">d+)</span>'</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="74" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
74
</td>
<td class="diff-line-num new_line" data-linenumber="74" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
74
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC74" class="line"></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="75" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
75
</td>
<td class="diff-line-num new_line" data-linenumber="75" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
75
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC75" class="line"><span class="n" style="color: #333">now</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">int</span><span class="p">(</span><span class="n" style="color: #333">time</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">time</span><span class="p">())</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="76" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
76
</td>
<td class="diff-line-num new_line" data-linenumber="76" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
76
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC76" class="line"></span>
</pre>
</td>
</tr>
<tr class="line_holder match" style="line-height: 1.6">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="79" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="79" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -79,4 +79,4 @@ for line in lines:</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="79" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
79
</td>
<td class="diff-line-num new_line" data-linenumber="79" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
79
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC79" class="line"> <span class="n" style="color: #333">match</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">pat</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">match</span><span class="p">(</span><span class="n" style="color: #333">line</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="80" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
80
</td>
<td class="diff-line-num new_line" data-linenumber="80" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
80
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC80" class="line"> <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">match</span> <span class="ow" style="font-weight: bold">and</span> <span class="n" style="color: #333">match</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">group</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.6">
<td class="diff-line-num old_line" data-linenumber="81" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
81
</td>
<td class="diff-line-num new_line" data-linenumber="81" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
81
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC81" class="line"> <span class="n" style="color: #333">temp</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">match</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">group</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" style="line-height: 1.6">
<td class="diff-line-num old old_line" data-linenumber="82" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
82
</td>
<td class="diff-line-num new_line old" data-linenumber="82" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">
<pre style="margin: 0">-<span id="LC82" class="line"> <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">stdout</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">write</span><span class="p">(</span><span class="s" style="color: #d14">'</span><span class="si" style="color: #d14">%</span><span class="s" style="color: #d14">d <span class="idiff left">SMART </span></span><span class="si" style="color: #d14"><span class="idiff">%</span></span><span class="s" style="color: #d14"><span class="idiff">s</span></span><span class="se" style="color: #d14"><span class="idiff">\n</span></span><span class="s" style="color: #d14"><span class="idiff">'</span></span><span class="idiff"> </span><span class="o" style="font-weight: bold"><span class="idiff">%</span></span><span class="idiff"> </span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333"><span class="idiff right">now</span></span><span class="p">,</span> <span class="n" style="color: #333">temp</span><span class="p">))</span></span></pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.6">
<td class="diff-line-num new old_line" data-linenumber="83" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="82" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
82
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0">+<span id="LC82" class="line"> <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">stdout</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">write</span><span class="p">(</span><span class="s" style="color: #d14">'</span><span class="si" style="color: #d14">%</span><span class="s" style="color: #d14">d </span><span class="si" style="color: #d14"><span class="idiff left">%</span></span><span class="s" style="color: #d14"><span class="idiff">s </span></span><span class="si" style="color: #d14"><span class="idiff">%</span></span><span class="s" style="color: #d14"><span class="idiff">s</span></span><span class="se" style="color: #d14"><span class="idiff">\n</span></span><span class="s" style="color: #d14"><span class="idiff">'</span></span><span class="idiff"> </span><span class="o" style="font-weight: bold"><span class="idiff">%</span></span><span class="idiff"> </span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333"><span class="idiff">now</span></span><span class="p"><span class="idiff">,</span></span><span class="idiff"> </span><span class="n" style="color: #333"><span class="idiff right">device</span></span><span class="p">,</span> <span class="n" style="color: #333">temp</span><span class="p">))</span></span></pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px">
<p style="color: #777; font-size: small">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/f96c2d19257ad9ecfab5a24466360334e32fcf9c">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/f96c2d19257ad9ecfab5a24466360334e32fcf9c"}}</script>
</p>
</div>
</body>
</html>