| author | Tero Marttila <terom@paivola.fi> |
| Sun, 13 Jan 2013 12:57:49 +0200 | |
| changeset 137 | e312f27b807d |
| parent 122 | f742c866c765 |
| child 172 | 2c971f7f28fe |
| permissions | -rw-r--r-- |
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
1 |
""" |
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
2 |
Iterate over input lines in filesystem files. |
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
3 |
""" |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
4 |
|
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
5 |
import os |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
6 |
|
|
49
30c615bf7751
pvl.syslog.tail: split Tail vs TailFile
Tero Marttila <terom@fixme.fi>
parents:
46
diff
changeset
|
7 |
import logging; log = logging.getLogger('pvl.syslog.tail')
|
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
8 |
|
|
49
30c615bf7751
pvl.syslog.tail: split Tail vs TailFile
Tero Marttila <terom@fixme.fi>
parents:
46
diff
changeset
|
9 |
class Tail (object) : |
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
10 |
""" |
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
11 |
Follow a file on the filesystem, reading lines until EOF, and re-opening if replaced. |
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
12 |
|
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
13 |
Never blocks, no fileno() to poll. Just poll(timeout=POLL). |
|
49
30c615bf7751
pvl.syslog.tail: split Tail vs TailFile
Tero Marttila <terom@fixme.fi>
parents:
46
diff
changeset
|
14 |
|
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
15 |
Not writable. |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
16 |
""" |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
17 |
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
18 |
POLL = 2.0 |
|
49
30c615bf7751
pvl.syslog.tail: split Tail vs TailFile
Tero Marttila <terom@fixme.fi>
parents:
46
diff
changeset
|
19 |
|
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
20 |
def __init__ (self, path, skip=None, **opts) : |
|
59
caed0ed82709
pvl.syslog.tail: re-implement seek=True
Tero Marttila <terom@fixme.fi>
parents:
53
diff
changeset
|
21 |
log.debug("%s", path)
|
|
caed0ed82709
pvl.syslog.tail: re-implement seek=True
Tero Marttila <terom@fixme.fi>
parents:
53
diff
changeset
|
22 |
|
|
49
30c615bf7751
pvl.syslog.tail: split Tail vs TailFile
Tero Marttila <terom@fixme.fi>
parents:
46
diff
changeset
|
23 |
self.path = path |
|
137
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
24 |
self.file = self.stat = None # closed |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
25 |
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
26 |
self.open() |
|
59
caed0ed82709
pvl.syslog.tail: re-implement seek=True
Tero Marttila <terom@fixme.fi>
parents:
53
diff
changeset
|
27 |
|
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
28 |
if skip : |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
29 |
self.skip() |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
30 |
|
|
137
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
31 |
def _stat (self) : |
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
32 |
""" |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
33 |
Return a key identifying the file at our path. |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
34 |
""" |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
35 |
|
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
36 |
st = os.stat(self.path) |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
37 |
|
|
53
685fd90bc610
pvl.syslog.tail: bugfix, log.debug readline
Tero Marttila <terom@fixme.fi>
parents:
49
diff
changeset
|
38 |
stat = st.st_dev, st.st_ino |
|
685fd90bc610
pvl.syslog.tail: bugfix, log.debug readline
Tero Marttila <terom@fixme.fi>
parents:
49
diff
changeset
|
39 |
|
|
685fd90bc610
pvl.syslog.tail: bugfix, log.debug readline
Tero Marttila <terom@fixme.fi>
parents:
49
diff
changeset
|
40 |
return stat |
|
137
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
41 |
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
42 |
def _open (self) : |
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
43 |
""" |
|
137
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
44 |
Return the opened file. |
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
45 |
""" |
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
46 |
|
|
137
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
47 |
return open(self.path, 'r') |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
48 |
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
49 |
def open (self) : |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
50 |
""" |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
51 |
Re-opens our file when closed. |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
52 |
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
53 |
Raises ValueError if already open. |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
54 |
""" |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
55 |
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
56 |
if self.file is None : |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
57 |
# XXX: use fstat for "atomic" open+stat? |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
58 |
self.file = self._open() |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
59 |
self.stat = self._stat() |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
60 |
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
61 |
log.debug("%s: %s: %s", self, self.file, self.stat)
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
62 |
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
63 |
else : |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
64 |
raise ValueError("%s: open already open tail" % (self, ))
|
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
65 |
|
|
49
30c615bf7751
pvl.syslog.tail: split Tail vs TailFile
Tero Marttila <terom@fixme.fi>
parents:
46
diff
changeset
|
66 |
def changed (self) : |
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
67 |
""" |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
68 |
Has the underlying file changed? |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
69 |
""" |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
70 |
|
|
137
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
71 |
return self._stat() != self.stat |
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
72 |
|
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
73 |
def readline (self) : |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
74 |
""" |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
75 |
Reads a line from the file, without trailing \n. |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
76 |
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
77 |
Returns None on EOF. |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
78 |
""" |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
79 |
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
80 |
line = self.file.readline() |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
81 |
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
82 |
if not line : |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
83 |
line = None |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
84 |
else : |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
85 |
line = line.rstrip('\r\n')
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
86 |
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
87 |
log.debug("%s", line)
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
88 |
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
89 |
return line |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
90 |
|
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
91 |
def readlines (self, eof_mark=False) : |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
92 |
""" |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
93 |
Reads any available lines from the file. |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
94 |
|
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
95 |
Reopens the file on EOF if the underlying file changed. |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
96 |
|
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
97 |
eof_mark: yields a special None line when this happens. |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
98 |
""" |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
99 |
|
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
100 |
while True : |
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
101 |
line = self.readline() |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
102 |
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
103 |
if line : |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
104 |
yield line |
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
105 |
|
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
106 |
elif self.changed() : |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
107 |
log.debug("EOF: reopen")
|
|
137
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
108 |
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
109 |
self.close() |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
110 |
self.open() |
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
111 |
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
112 |
if eof_mark : |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
113 |
yield None # special token |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
114 |
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
115 |
# keep going |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
116 |
continue |
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
117 |
|
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
118 |
else : |
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
119 |
log.debug("EOF: wait")
|
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
120 |
break |
|
31
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
121 |
|
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
122 |
__iter__ = readlines |
|
3e6d0feb115c
pvl.syslog: import from pvl-collectd
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
123 |
|
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
124 |
def skip (self) : |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
125 |
""" |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
126 |
Skip any available lines. |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
127 |
""" |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
128 |
|
|
137
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
129 |
log.debug("%s", self)
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
130 |
|
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
131 |
for line in self.readlines() : |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
132 |
pass |
|
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
133 |
|
|
137
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
134 |
def close (self) : |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
135 |
""" |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
136 |
Close our file, if open. Further operations raise ValueError. |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
137 |
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
138 |
log.warn's if already closed. |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
139 |
""" |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
140 |
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
141 |
if self.file : |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
142 |
log.debug("%s", self)
|
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
143 |
self.file.close() |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
144 |
else : |
|
e312f27b807d
pvl.syslog.tail: refactor, and implement close()
Tero Marttila <terom@paivola.fi>
parents:
122
diff
changeset
|
145 |
log.warn("%s: close on already closed tail", self)
|
|
114
2e88e1d8e604
pvl.syslog.tail: split into pvl.syslog.file/tail, clarify line/None/EOFError behaviour
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
146 |
|
|
53
685fd90bc610
pvl.syslog.tail: bugfix, log.debug readline
Tero Marttila <terom@fixme.fi>
parents:
49
diff
changeset
|
147 |
def __str__ (self) : |
|
685fd90bc610
pvl.syslog.tail: bugfix, log.debug readline
Tero Marttila <terom@fixme.fi>
parents:
49
diff
changeset
|
148 |
return self.path |
|
685fd90bc610
pvl.syslog.tail: bugfix, log.debug readline
Tero Marttila <terom@fixme.fi>
parents:
49
diff
changeset
|
149 |