Skip to content

Commit 3939737

Browse files
committed
picoev: support -d picoev_verbose_errors, do not use any naked eprintln by default, since that is a low level module
1 parent 45cbf4f commit 3939737

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

vlib/picoev/errors.v

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module picoev
2+
3+
@[if picoev_verbose_errors ?]
4+
fn elog(msg string) {
5+
eprintln(msg)
6+
}

vlib/picoev/picoev.v

+10-10
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ pub fn (mut pv Picoev) add(fd int, events int, timeout int, callback voidptr) in
112112

113113
if pv.update_events(fd, events | picoev_add) != 0 {
114114
if pv.delete(fd) != 0 {
115-
eprintln('Error during del')
115+
elog('Error during del')
116116
}
117117

118118
return -1
@@ -143,7 +143,7 @@ pub fn (mut pv Picoev) delete(fd int) int {
143143
}
144144

145145
if pv.update_events(fd, picoev_del) != 0 {
146-
eprintln('Error during update_events. event: `picoev.picoev_del`')
146+
elog('Error during update_events. event: `picoev.picoev_del`')
147147
return -1
148148
}
149149

@@ -158,7 +158,7 @@ fn (mut pv Picoev) loop_once(max_wait_in_sec int) int {
158158
pv.loop.now = get_time()
159159

160160
if pv.poll_once(max_wait_in_sec) != 0 {
161-
eprintln('Error during poll_once')
161+
elog('Error during poll_once')
162162
return -1
163163
}
164164

@@ -216,7 +216,7 @@ fn accept_callback(listen_fd int, events int, cb_arg voidptr) {
216216
return
217217
}
218218

219-
eprintln('Error during accept')
219+
elog('Error during accept')
220220
return
221221
}
222222

@@ -231,7 +231,7 @@ fn accept_callback(listen_fd int, events int, cb_arg voidptr) {
231231
}
232232

233233
setup_sock(accepted_fd) or {
234-
eprintln('setup_sock failed, fd: ${accepted_fd}, listen_fd: ${listen_fd}, err: ${err.code()}')
234+
elog('setup_sock failed, fd: ${accepted_fd}, listen_fd: ${listen_fd}, err: ${err.code()}')
235235
pv.error_callback(pv.user_data, picohttpparser.Request{}, mut &picohttpparser.Response{},
236236
err)
237237
close_socket(accepted_fd) // Close fd on failure
@@ -244,7 +244,7 @@ fn accept_callback(listen_fd int, events int, cb_arg voidptr) {
244244
@[inline]
245245
pub fn (mut pv Picoev) close_conn(fd int) {
246246
if pv.delete(fd) != 0 {
247-
eprintln('Error during del')
247+
elog('Error during del')
248248
}
249249
close_socket(fd)
250250
}
@@ -306,7 +306,7 @@ fn raw_callback(fd int, events int, context voidptr) {
306306
return
307307
}
308308

309-
eprintln('Error during req_read')
309+
elog('Error during req_read')
310310

311311
// fatal error
312312
pv.close_conn(fd)
@@ -344,14 +344,14 @@ fn raw_callback(fd int, events int, context voidptr) {
344344
}
345345

346346
fn default_error_callback(data voidptr, req picohttpparser.Request, mut res picohttpparser.Response, error IError) {
347-
eprintln('picoev: ${error}')
347+
elog('picoev: ${error}')
348348
res.end()
349349
}
350350

351351
// new creates a `Picoev` struct and initializes the main loop
352352
pub fn new(config Config) !&Picoev {
353353
listening_socket_fd := listen(config) or {
354-
eprintln('Error during listen: ${err}')
354+
elog('Error during listen: ${err}')
355355
return err
356356
}
357357

@@ -384,7 +384,7 @@ pub fn new(config Config) !&Picoev {
384384
}
385385

386386
if pv.loop == unsafe { nil } {
387-
eprintln('Failed to create loop')
387+
elog('Failed to create loop')
388388
close_socket(listening_socket_fd)
389389
return unsafe { nil }
390390
}

0 commit comments

Comments
 (0)