From: Alexander Turenko <alexander.turenko@tarantool.org> To: Cyrill Gorcunov <gorcunov@gmail.com> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH 11/12] popen: clarify popen_read_timeout error message Date: Wed, 15 Apr 2020 07:21:36 +0300 [thread overview] Message-ID: <20200415042136.p6udliisud4da2kf@tkn_work_nb> (raw) In-Reply-To: <c953d23768e51fa14f76e82af85ee04111bfb620.1586862436.git.alexander.turenko@tarantool.org> On Tue, Apr 14, 2020 at 02:38:20PM +0300, Alexander Turenko wrote: > Popen backend errors should be meaningful for a user of the popen Lua > API, because otherwise we'll need to map backend errors into Lua API > errors. This particular failure can't appear when the function is called > from the Lua API, but it is good to keep all error messages in one > style. > > Part of #4031 > --- > src/lib/core/popen.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/src/lib/core/popen.c b/src/lib/core/popen.c > index 36cd7b07d..640dffc2b 100644 > --- a/src/lib/core/popen.c > +++ b/src/lib/core/popen.c > @@ -360,7 +360,7 @@ popen_write_timeout(struct popen_handle *handle, const void *buf, > * > * - IllegalParams: a parameter check fails: > * - count: buffer is too big. > - * - flags: POPEN_FLAG_FD_STD{OUT,ERR} are set or unset both. > + * - flags: stdout and stdrr are both choosen or both missed > * - handle: handle does not support the requested IO operation. > * - SocketError: an IO error occurs at read(). > * - TimedOut: @a timeout quota is exceeded. > @@ -379,8 +379,8 @@ popen_read_timeout(struct popen_handle *handle, void *buf, > } > > if (!(flags & (POPEN_FLAG_FD_STDOUT | POPEN_FLAG_FD_STDERR))) { > - diag_set(IllegalParams, "popen: POPEN_FLAG_FD_STD{OUT,ERR} are " > - "unset both"); > + diag_set(IllegalParams, > + "popen: neither stdout nor stderr is choosen"); > return -1; > } I was inattentive: there is an error message of the same style in popen_read_timeout(). Those functions should be changed both together. Incremental diff: diff --git a/src/lib/core/popen.c b/src/lib/core/popen.c index 640dffc2b..64711d737 100644 --- a/src/lib/core/popen.c +++ b/src/lib/core/popen.c @@ -297,7 +297,7 @@ stdX_str(unsigned int index) * * - IllegalParams: a parameter check fails: * - count: data is too big. - * - flags: POPEN_FLAG_FD_STDIN bit is unset. + * - flags: stdin is not choosen. * - handle: handle does not support the requested IO operation. * - SocketError: an IO error occurs at write(). * - TimedOut: @a timeout quota is exceeded. @@ -322,8 +322,7 @@ popen_write_timeout(struct popen_handle *handle, const void *buf, } if (!(flags & POPEN_FLAG_FD_STDIN)) { - diag_set(IllegalParams, - "popen: POPEN_FLAG_FD_STDIN bit is unset"); + diag_set(IllegalParams, "popen: stdin is not choosen"); return -1; } The new commit message: | popen: refine popen_{read,write}_timeout errors | | Popen backend errors should be meaningful for a user of the popen Lua | API, because otherwise we'll need to map backend errors into Lua API | errors. Those particular failures can't appear when the functions are | called from the Lua API, but it is good to keep all error messages in | one style. | | Part of #4031 Don't sure, however, that 'choosen' is the right word in this context.
next prev parent reply other threads:[~2020-04-15 4:21 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-14 11:38 [Tarantool-patches] [PATCH 00/12] Popen Lua API: preliminary patches 2 Alexander Turenko 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 01/12] popen: allow to kill process group Alexander Turenko 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 02/12] popen: add ability to keep child on deletion Alexander Turenko 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 03/12] popen: log a reason of close inherited fds failure Alexander Turenko 2020-04-14 11:52 ` Cyrill Gorcunov 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 04/12] popen: add missed diag_set() in popen_new() Alexander Turenko 2020-04-14 11:54 ` Cyrill Gorcunov 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 05/12] popen: remove retval from popen_stat() Alexander Turenko 2020-04-14 11:54 ` Cyrill Gorcunov 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 06/12] popen: quote multiword command arguments Alexander Turenko 2020-04-14 11:58 ` Cyrill Gorcunov 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 07/12] popen: add logging of duplicated logger fd Alexander Turenko 2020-04-14 11:58 ` Cyrill Gorcunov 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 08/12] popen: fix close-on-exec flag setting Alexander Turenko 2020-04-14 12:03 ` Cyrill Gorcunov 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 09/12] popen: clarify popen_{signal, delete} contract Alexander Turenko 2020-04-14 12:29 ` Cyrill Gorcunov 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 10/12] popen: add FIXME re group signal flaw Alexander Turenko 2020-04-14 13:19 ` Cyrill Gorcunov 2020-04-15 4:21 ` Alexander Turenko 2020-04-15 7:27 ` Cyrill Gorcunov 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 11/12] popen: clarify popen_read_timeout error message Alexander Turenko 2020-04-14 12:32 ` Cyrill Gorcunov 2020-04-15 4:21 ` Alexander Turenko [this message] 2020-04-15 7:39 ` Cyrill Gorcunov 2020-04-15 21:45 ` Alexander Turenko 2020-04-14 11:38 ` [Tarantool-patches] [PATCH 12/12] popen: allow to close parent's end of std* fds Alexander Turenko 2020-04-14 13:05 ` Cyrill Gorcunov 2020-04-15 4:21 ` Alexander Turenko 2020-04-15 7:43 ` Cyrill Gorcunov 2020-04-15 21:45 ` Alexander Turenko 2020-04-15 4:25 ` [Tarantool-patches] [PATCH 13/13] popen: add caution comment for popen_may_io() Alexander Turenko 2020-04-15 7:44 ` Cyrill Gorcunov 2020-04-15 4:52 ` [Tarantool-patches] [PATCH 14/14] popen: fix popen_write_timeout retval type Alexander Turenko 2020-04-15 23:57 ` [Tarantool-patches] [PATCH 00/12] Popen Lua API: preliminary patches 2 Alexander Turenko 2020-04-16 0:00 ` Alexander Turenko 2020-04-16 11:52 ` Cyrill Gorcunov 2020-04-17 6:58 ` Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200415042136.p6udliisud4da2kf@tkn_work_nb \ --to=alexander.turenko@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 11/12] popen: clarify popen_read_timeout error message' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox