equal
deleted
inserted
replaced
1 import optparse, sys |
1 import optparse, sys |
2 |
2 |
3 from pvl.syslog.parser import SyslogParser |
3 from pvl.syslog.parser import SyslogParser |
|
4 from pvl.syslog.filter import SyslogFilter |
4 from pvl.syslog.syslog import SyslogSource |
5 from pvl.syslog.syslog import SyslogSource |
5 from pvl.syslog import fifo, tail |
6 from pvl.syslog import fifo, tail |
6 |
7 |
7 # XXX: use optparse parser.error()? |
8 # XXX: use optparse parser.error()? |
8 import logging; log = logging.getLogger('pvl.syslog.args') |
9 import logging; log = logging.getLogger('pvl.syslog.args') |
60 return None |
61 return None |
61 |
62 |
62 else : |
63 else : |
63 log.error("No --syslog source given") |
64 log.error("No --syslog source given") |
64 sys.exit(2) |
65 sys.exit(2) |
65 |
66 |
66 parser = SyslogParser( |
67 parser = SyslogParser( |
67 raw = options.syslog_raw, |
68 raw = options.syslog_raw, |
|
69 ) |
|
70 |
|
71 filter = SyslogFilter( |
68 prog = options.syslog_prog, |
72 prog = options.syslog_prog, |
69 ) |
73 ) |
70 |
74 |
71 # build |
75 # build |
72 return SyslogSource(source, parser, |
76 return SyslogSource(source, parser, |
73 poll = poll |
77 filter = filter, |
|
78 poll = poll, |
74 ) |
79 ) |
75 |
80 |