[Git][NTPsec/ntpsec][master] 2 commits: internal name change for makeheat
Gary E. Miller
gitlab at mg.gitlab.com
Wed Feb 22 20:27:08 UTC 2017
Gary E. Miller pushed to branch master at NTPsec / ntpsec
Commits:
0dd1061a by James Browning at 2017-02-22T12:26:50-08:00
internal name change for makeheat
Signed-off-by: Gary E. Miller <gem at rellim.com>
- - - - -
cfaa8ce5 by James Browning at 2017-02-22T12:26:50-08:00
rename temp-log to ntplogtemp and rename gps-log to ntploggps.
And trickle changes through documentation
Signed-off-by: Gary E. Miller <gem at rellim.com>
- - - - -
12 changed files:
- contrib/README
- contrib/makeheat
- docs/includes/manual.txt
- docs/includes/gps-log-body.txt → docs/includes/ntploggps-body.txt
- docs/includes/temp-log-body.txt → docs/includes/ntplogtemp-body.txt
- docs/gps-log.txt → docs/ntploggps.txt
- ntpclients/gps-log → ntpclients/ntploggps
- ntpclients/gps-log-man.txt → ntpclients/ntploggps-man.txt
- ntpclients/temp-log → ntpclients/ntplogtemp
- ntpclients/temp-log-man.txt → ntpclients/ntplogtemp-man.txt
- ntpclients/ntpviz
- wscript
Changes:
=====================================
contrib/README
=====================================
--- a/contrib/README
+++ b/contrib/README
@@ -3,7 +3,7 @@ conveniences, examples or rudimentary starting points for other development
efforts.
cpu-temp-log, smartctl-temp-log, temper-temp-log and zone-temp-log
-have been replaced by temp-log. Those programs will stay in contrib for
+have been replaced by ntplogtemp. Those programs will stay in contrib for
a while to give users a chance to migrate.
cpu-temp-log is a tool to use the output of 'sensors -u' and write the
=====================================
contrib/makeheat
=====================================
--- a/contrib/makeheat
+++ b/contrib/makeheat
@@ -24,7 +24,7 @@ import time
try:
import ntp.util
except ImportError as e:
- sys.stderr.write("temp-log: can't find Python NTP modules "
+ sys.stderr.write("makeheat: can't find Python NTP modules "
"-- check PYTHONPATH.\n%s\n" % e)
sys.exit(1)
@@ -50,7 +50,7 @@ parser.add_argument('-w', '--wait',
type=float)
parser.add_argument('-V', '--version',
action="version",
- version="temp-log %s" % ntp.util.stdversion())
+ version="makeheat %s" % ntp.util.stdversion())
args = parser.parse_args()
args.copies[0] -= 1
=====================================
docs/includes/manual.txt
=====================================
--- a/docs/includes/manual.txt
+++ b/docs/includes/manual.txt
@@ -1,5 +1,5 @@
=== Manual Pages ===
-* link:gps-log.html[+gps-log+ - log gpsd data for use by ntpviz]
+* link:ntploggps.html[+ntploggps+ - log gpsd data for use by ntpviz]
* link:ntp_conf.html[+ntp.conf+ - ntpd Configuration File]
* link:ntpd.html[+ntpd+ - Network Time Protocol (NTP) daemon]
* link:ntpdig.html[+ntpdig+ - Simple Network Time Protocol (SNTP) client]
=====================================
docs/includes/gps-log-body.txt → docs/includes/ntploggps-body.txt
=====================================
--- a/docs/includes/gps-log-body.txt
+++ b/docs/includes/ntploggps-body.txt
@@ -1,10 +1,10 @@
-// This is the body of the manual page for gps-log
+// This is the body of the manual page for ntploggps
// It's included in two places: once for the docs/ HTML
// tree, and once to make an individual man page.
== SYNOPSIS ==
[verse]
-gps-log [-h] [-l LOGFILE] [-o] [-w WAIT] [-v] [-V]
+ntploggps [-h] [-l LOGFILE] [-o] [-w WAIT] [-v] [-V]
-h, --help show this help message and exit
-l LOGFILE, --logfile LOGFILE
@@ -16,8 +16,8 @@ gps-log [-h] [-l LOGFILE] [-o] [-w WAIT] [-v] [-V]
== DESCRIPTION ==
-gps-log connects to a local gpsd daemon and logs the number of satellites
-in use and the Time Dilution of Precision (TDOP). gps-log can run as
+ntploggps connects to a local gpsd daemon and logs the number of satellites
+in use and the Time Dilution of Precision (TDOP). ntploggps can run as
any user, no special privileges are required.
The default is to write the data to stdout about once every 5 seconds.
@@ -63,11 +63,11 @@ GPS always output a static TDOP.
== USAGE ==
-+gps-log+::
++ntploggps+::
This the simplest use of this program. It can be used to check the
status of the local gpsd daemon.
-+gps-log -l /var/log/ntpstats/gpsd -w 60+ &::
++ntploggps -l /var/log/ntpstats/gpsd -w 60+ &::
This will continuously log the gpsd data in the background to the file
/var/log/ntpstats/gpsd. Only log every 60 seconds.
=====================================
docs/includes/temp-log-body.txt → docs/includes/ntplogtemp-body.txt
=====================================
--- a/docs/includes/temp-log-body.txt
+++ b/docs/includes/ntplogtemp-body.txt
@@ -1,10 +1,10 @@
-// This is the body of the manual page for temp-log
+// This is the body of the manual page for ntplogtemp
// It's included in two places: once for the docs/ HTML
// tree, and once to make an individual man page.
== SYNOPSIS ==
[verse]
-temp-log [-h] [-l LOGFILE] [-o] [-w WAIT] [-v] [-V]
+ntplogtemp [-h] [-l LOGFILE] [-o] [-w WAIT] [-v] [-V]
-h, --help show this help message and exit
-l LOGFILE, --logfile LOGFILE
@@ -17,7 +17,7 @@ temp-log [-h] [-l LOGFILE] [-o] [-w WAIT] [-v] [-V]
== DESCRIPTION ==
-temp-log gathers temperature readings across a system. The standard user
+ntplogtemp gathers temperature readings across a system. The standard user
is ntpuser and should have permissions to execute lm_sensors and smartctl.
The default is to write the data to stdout once every 60 seconds.
@@ -63,11 +63,11 @@ The log file looks like:
== USAGE ==
-+temp-log+::
++ntplogtemp+::
This the simplest use of this program. It can be used to check the
temperature readings of Zones, CPU, and disk drives every minute.
-+gps-log -l /var/log/ntpstats/temperature -w 60 &::
++ntplogtemp -l /var/log/ntpstats/temperature -w 60 &::
This will continuously log the temperature data in the background
to the file /var/log/ntpstats/temperature. Only log every 60 seconds.
=====================================
docs/gps-log.txt → docs/ntploggps.txt
=====================================
--- a/docs/gps-log.txt
+++ b/docs/ntploggps.txt
@@ -1,4 +1,4 @@
-= gps-log - log gpsd data for use by ntpviz =
+= ntploggps - log gpsd data for use by ntpviz =
[cols="10%,90%",frame="none",grid="none",style="verse"]
|==============================
@@ -11,7 +11,7 @@ S is for snakeoil.
'''''
-include::includes/gps-log-body.txt[]
+include::includes/ntploggps-body.txt[]
'''''
=====================================
ntpclients/gps-log → ntpclients/ntploggps
=====================================
--- a/ntpclients/gps-log
+++ b/ntpclients/ntploggps
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# coding: utf-8
"""\
-usage: gps-log [-h] [-o] [-l LOGFILE] [-v] [-V]
+usage: ntploggps [-h] [-o] [-l LOGFILE] [-v] [-V]
gpsd log file generator
@@ -28,7 +28,7 @@ try:
import gps
import ntp.util
except ImportError as e:
- sys.stderr.write("gps-log: can't find Python NTP modules "
+ sys.stderr.write("ntploggps: can't find Python NTP modules "
"-- check PYTHONPATH.\n")
sys.stderr.write("%s\n" % e)
sys.exit(1)
@@ -37,7 +37,7 @@ try:
import argparse
except ImportError:
sys.stderr.write("""
-gps-log: can't find the Python argparse module
+ntpologgps: can't find the Python argparse module
If your Python version is < 2.7, then manual installation is needed:
# pip install argparse
""")
@@ -73,12 +73,12 @@ parser.add_argument('-v', '--verbose',
parser.add_argument('-V', '--version',
action="version",
- version="gps-log %s" % ntp.util.stdversion())
+ version="ntploggps %s" % ntp.util.stdversion())
args = parser.parse_args()
if args.verbose:
- print("gps-log: arguments:")
+ print("ntploggps: arguments:")
print(args)
if args.logfile:
@@ -86,12 +86,12 @@ if args.logfile:
try:
out = open(args.logfile[0], mode='a')
except io.UnsupportedOperation as e:
- sys.stderr.write("gps-log: can't open logfile %s\n" % args.logfile)
+ sys.stderr.write("ntploggps: can't open logfile %s\n" % args.logfile)
sys.stderr.write("%s\n" % e)
sys.exit(1)
if args.verbose:
- print("gps-log: opened log file %s" % args.logfile[0])
+ print("ntploggps: opened log file %s" % args.logfile[0])
else:
# log to stdout
@@ -107,7 +107,7 @@ class GpsPoller(threading.Thread):
try:
self.gpsd = gps.gps(mode=gps.WATCH_ENABLE)
except BaseException as e:
- sys.stderr.write("gps-log: Can't connect to gpsd, %s\n"
+ sys.stderr.write("ntploggps: Can't connect to gpsd, %s\n"
" Is gpsd running?\n" % e)
sys.exit(1)
self.running = True
@@ -134,7 +134,7 @@ class GpsPoller(threading.Thread):
if __name__ == '__main__':
# this is the main thread
if args.verbose:
- print("gps-log: creating poll thread")
+ print("ntploggps: creating poll thread")
gpsp = GpsPoller() # create the thread
try:
@@ -178,7 +178,7 @@ if __name__ == '__main__':
gpsp.join()
if args.verbose:
- print("gps-log: Done -- Exiting.")
+ print("ntploggps: Done -- Exiting.")
# mom says: be nice and flush
out.flush()
=====================================
ntpclients/gps-log-man.txt → ntpclients/ntploggps-man.txt
=====================================
--- a/ntpclients/gps-log-man.txt
+++ b/ntpclients/ntploggps-man.txt
@@ -1,10 +1,10 @@
-= gps-log(1) =
+= ntploggps(1) =
:doctype: manpage
== NAME ==
-gps-log - log gpsd data
+ntploggps - log gpsd data
-include::../docs/includes/gps-log-body.txt[]
+include::../docs/includes/ntploggps-body.txt[]
== EXIT STATUS ==
=====================================
ntpclients/temp-log → ntpclients/ntplogtemp
=====================================
--- a/ntpclients/temp-log
+++ b/ntpclients/ntplogtemp
@@ -1,6 +1,6 @@
#!/usr/bin/env python
"""\
-usage: temp-log.py [-h] [-l LOGFILE] [-o] [-q] [-v] [-w WAIT] [-V]
+usage: ntplogtemp [-h] [-l LOGFILE] [-o] [-q] [-v] [-w WAIT] [-V]
Program to log system temperatures
@@ -30,7 +30,7 @@ import time
try:
import ntp.util
except ImportError as e:
- sys.stderr.write("temp-log: can't find Python NTP modules "
+ sys.stderr.write("ntplogtemp: can't find Python NTP modules "
"-- check PYTHONPATH.\n%s\n" % e)
sys.exit(1)
@@ -220,7 +220,7 @@ parser.add_argument('-w', '--wait',
type=int)
parser.add_argument('-V', '--version',
action="version",
- version="temp-log %s" % ntp.util.stdversion())
+ version="ntplogtemp %s" % ntp.util.stdversion())
args = parser.parse_args()
=====================================
ntpclients/temp-log-man.txt → ntpclients/ntplogtemp-man.txt
=====================================
--- a/ntpclients/temp-log-man.txt
+++ b/ntpclients/ntplogtemp-man.txt
@@ -1,10 +1,10 @@
-= temp-log(1) =
+= ntplogtemp-(1) =
:doctype: manpage
== NAME ==
-temp-log - log temperature data
+ntplogtemp - log temperature data
-include::../docs/includes/temp-log-body.txt[]
+include::../docs/includes/ntplogtemp-body.txt[]
== EXIT STATUS ==
=====================================
ntpclients/ntpviz
=====================================
--- a/ntpclients/ntpviz
+++ b/ntpclients/ntpviz
@@ -716,7 +716,7 @@ plot \\
<p>Local GPS. The Time Dilution of Precision (TDOP) is plotted in blue.
The number of visible satellites (nSat) is plotted in red.</p>
<p>TDOP is field 3, and nSats is field 4, from the gpsd log file. The
-gpsd log file is created by the gps-log program.</p>
+gpsd log file is created by the ntploggps program.</p>
<p>TDOP is a dimensionless error factor. TDOP ranges from 1 to greater
than 20. 1 denotes the highest possible confidence level. 2 to 5 is good.
Greater than 20 means there will be significant inaccuracy and error.</p>
=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -146,7 +146,7 @@ def afterparty(ctx):
% (bldnode,))
python_scripts = [
- "ntpclients/gps-log",
+ "ntpclients/ntploggps",
"ntpclients/ntpdig",
"ntpclients/ntpkeygen",
"ntpclients/ntpmon",
@@ -155,7 +155,7 @@ python_scripts = [
"ntpclients/ntptrace",
"ntpclients/ntpviz",
"ntpclients/ntpwait",
- "ntpclients/temp-log",
+ "ntpclients/ntplogtemp",
]
@@ -205,14 +205,14 @@ def build(ctx):
if ctx.cmd == 'clean' or ctx.cmd == 'distclean':
afterparty(ctx)
- ctx.manpage(1, "ntpclients/gps-log-man.txt")
+ ctx.manpage(1, "ntpclients/ntploggps-man.txt")
ctx.manpage(1, "ntpclients/ntpdig-man.txt")
ctx.manpage(1, "ntpclients/ntpmon-man.txt")
ctx.manpage(1, "ntpclients/ntpq-man.txt")
ctx.manpage(1, "ntpclients/ntpsweep-man.txt")
ctx.manpage(1, "ntpclients/ntptrace-man.txt")
ctx.manpage(1, "ntpclients/ntpviz-man.txt")
- ctx.manpage(1, "ntpclients/temp-log-man.txt")
+ ctx.manpage(1, "ntpclients/ntplogtemp-man.txt")
ctx.manpage(8, "ntpclients/ntpkeygen-man.txt")
ctx.manpage(8, "ntpclients/ntpleapfetch-man.txt")
ctx.manpage(8, "ntpclients/ntpwait-man.txt")
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/253de053b3e5b21a600db620f56f87f73c37d786...cfaa8ce573d430285fa59db3245a2a28a311d9fe
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170222/827d5fb2/attachment.html>
More information about the vc
mailing list