[Git][NTPsec/ntpsec][missing-ntpmon-units] 5 commits: DNS reworking was not 10 years ago.

[Ian Bruene]

Ian Bruene pushed to branch missing-ntpmon-units at NTPsec / ntpsec


Commits:
27d84956 by Matt Selsky at 2017-04-18T00:49:29-04:00
DNS reworking was not 10 years ago.

- - - - -
054b1cb7 by Matt Selsky at 2017-04-18T01:04:11-04:00
check_sanity() is now used in only 1 place. No need to keep it separate.

- - - - -
1e7a0812 by Matt Selsky at 2017-04-18T02:03:09-04:00
Add Debian Jessie to the list of GitLab Pipeline targets

- - - - -
51acd57a by Ian Bruene at 2017-04-18T14:08:27-05:00
Fixed lack of 4th digit in unitless display.

- - - - -
847d0d5c by Ian Bruene at 2017-04-18T16:33:06-05:00
Nailed missing clockvar units bug to the wall.

- - - - -


5 changed files:

- .gitlab-ci.yml
- ntpclients/ntpmon
- pylib/util.py
- wafhelpers/check_pthread.py
- − wafhelpers/tool.py


Changes:

=====================================
.gitlab-ci.yml
=====================================
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,3 +33,17 @@ gitlab-refclocks:
     - python ./waf configure --refclock=all build
   tags:
     - gitlab-org
+
+debian-jessie-basic:
+  <<: *job_definition
+  script:
+    - python ./waf configure build
+  tags:
+    - debian-jessie
+
+debian-jessie-refclocks:
+  <<: *job_definition
+  script:
+    - python ./waf configure --refclock=all build
+  tags:
+    - debian-jessie


=====================================
ntpclients/ntpmon
=====================================
--- a/ntpclients/ntpmon
+++ b/ntpclients/ntpmon
@@ -309,7 +309,8 @@ if __name__ == '__main__':
                                     peers[selected].associd,
                                     opcode=ntp.control.CTL_OP_READCLOCK,
                                     raw=True)
-                                strconvert = ntp.util.cook(clockvars)
+                                strconvert = ntp.util.cook(clockvars,
+                                                           showunits)
                                 stdscr.addstr(strconvert.encode('UTF-8'))
                             except ntp.packet.ControlException as e:
                                 pass


=====================================
pylib/util.py
=====================================
--- a/pylib/util.py
+++ b/pylib/util.py
@@ -756,8 +756,7 @@ class PeerSummary:
                 reach = value
             elif name == "delay":
                 estdelay = rawvalue if self.showunits else value
-            elif name == "delay-s":
-                if len(value) > 6 and value[-7] == ".":
+                if len(rawvalue) > 6 and rawvalue[-7] == ".":
                     saw6 = True
             elif name == "offset":
                 estoffset = rawvalue if self.showunits else value
@@ -810,7 +809,7 @@ class PeerSummary:
         else:
             c = " .+*"[ntp.control.CTL_PEER_STATVAL(rstatus) & 0x3]
         # Source host or clockname or poolname or servername
-        # After new DNS, 2007-Apr-17
+        # After new DNS, 2017-Apr-17
         # servers setup via numerical IP Address have only srcadr
         # servers setup via DNS have both srcadr and srchost
         # refclocks have both srcadr and srchost


=====================================
wafhelpers/check_pthread.py
=====================================
--- a/wafhelpers/check_pthread.py
+++ b/wafhelpers/check_pthread.py
@@ -1,4 +1,4 @@
-from wafhelpers.tool import check_sanity
+from waflib.Logs import pprint
 
 PTHREAD_FRAG = """
 #include <pthread.h>
@@ -54,3 +54,16 @@ def check_pthread_run(ctx):
     else:
         ctx.env.PTHREAD_ENABLE = True
         ctx.define("HAVE_PTHREAD", 1, comment="pthread support")
+
+
+def check_sanity(ctx, cond, lib):
+    define = "HAVE_%s" % lib.upper()
+
+    if cond and (not ctx.get_define(define)):
+        pprint("RED",
+               "Warning %s headers detected, binaries do not build/run"
+               % lib)
+    elif (not cond) and ctx.get_define(define):
+        pprint("RED",
+               "Warning %s headers not detected, binaries build/run"
+               % lib)


=====================================
wafhelpers/tool.py deleted
=====================================
--- a/wafhelpers/tool.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from waflib.Logs import pprint
-
-
-def check_sanity(ctx, cond, lib):
-        define = "HAVE_%s" % lib.upper()
-
-        if cond and (not ctx.get_define(define)):
-                pprint("RED",
-                       "Warning %s headers detected, binaries do not build/run"
-                       % lib)
-        elif (not cond) and ctx.get_define(define):
-                pprint("RED",
-                       "Warning %s headers not detected, binaries build/run"
-                       % lib)



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/d548415503cc9fff6e276fcccf0cfe7a03b1a4ea...847d0d5c32b486367593f184bbe5230325e84ef8

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/d548415503cc9fff6e276fcccf0cfe7a03b1a4ea...847d0d5c32b486367593f184bbe5230325e84ef8
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170418/85d145a5/attachment.html>