equal
deleted
inserted
replaced
26 syslog.add_option('--syslog-tail', type='float', metavar='TIMEOUT', |
26 syslog.add_option('--syslog-tail', type='float', metavar='TIMEOUT', |
27 help="Continuously poll file") |
27 help="Continuously poll file") |
28 |
28 |
29 syslog.add_option('--syslog-raw', action='store_true', |
29 syslog.add_option('--syslog-raw', action='store_true', |
30 help="Parse raw syslog lines without timestamp/etc") |
30 help="Parse raw syslog lines without timestamp/etc") |
|
31 |
|
32 syslog.add_option('--syslog-facility', metavar='FACILITY', |
|
33 help="Set/filter by given facility") |
31 |
34 |
32 syslog.add_option('--syslog-prog', metavar='PROG', default=prog, |
35 syslog.add_option('--syslog-prog', metavar='PROG', default=prog, |
33 help="Filter by given prog: %default") |
36 help="Filter by given prog: %default") |
34 |
37 |
35 return syslog |
38 return syslog |
67 source = tail.Tail(sys.stdin) |
70 source = tail.Tail(sys.stdin) |
68 poll = False # XXX: tty vs pipe vs file? |
71 poll = False # XXX: tty vs pipe vs file? |
69 |
72 |
70 # options |
73 # options |
71 parser = SyslogParser( |
74 parser = SyslogParser( |
72 raw = options.syslog_raw, |
75 raw = options.syslog_raw, |
|
76 facility = options.syslog_facility, |
73 ) |
77 ) |
74 |
78 |
75 filter = SyslogFilter( |
79 filter = SyslogFilter( |
76 # glob pattern |
80 # glob pattern |
77 prog = options.syslog_prog, |
81 prog = options.syslog_prog, |
|
82 facility = options.syslog_facility, |
78 ) |
83 ) |
79 |
84 |
80 # polling |
85 # polling |
81 return SyslogSource(source, parser, filter, poll) |
86 return SyslogSource(source, parser, filter, poll) |