Skip to content

Commit

Permalink
Bug 23400: Add --status to koha-indexer
Browse files Browse the repository at this point in the history
koha-zebra has a nice, informative --status switch, koha-indexer
does not. This patch adds it.

To test:
- Run "sudo koha-indexer --status kohadev" - you get an error:
  "Error: invalid option switch (--status)"
- Apply this patch
- If you are on e.g. kohadevbox you need to copy koha-indexer to
  where it is actually run from:
  sudo cp debian/scripts/koha-indexer /usr/sbin/koha-indexer
- Run "sudo koha-indexer --status kohadev" again and you should
  get a nice status telling if the indexer is running or not
- Toggle the indexer on and off with koha-indexer --start/--stop
  and verify the status is telling the truth about the state of
  the indexer
- Run "sudo koha-indexer --help" and check there is a description
  of the --status option
- Have a look at debian/docs/koha-indexer.xml and verify there is
  an adequate description of the --status option.
- Run "prove -v xt/verify-debian-docbook.t" to check the structure
  of the man page in DocBook format.

PS: I tried to generate a manpage from the DocBook as described at
https://wiki.koha-community.org/wiki/Testing_man_pages
but the output did not look good for any of our DocBook files.
Not sure why.

Signed-off-by: David Nind <[email protected]>
Signed-off-by: Nick Clemens <[email protected]>
Signed-off-by: Martin Renvoize <[email protected]>
  • Loading branch information
MagnusEnger authored and mrenvoize committed Oct 8, 2019
1 parent 21412af commit 38a7e5e
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
9 changes: 8 additions & 1 deletion debian/docs/koha-indexer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>koha-indexer</command>
<arg choice="req"><option>--start</option>|<option>--stop</option>|<option>--restart</option>|<option>--help</option>|<option>-h</option>|<option>--quiet</option>|<option>-q</option></arg>
<arg choice="req"><option>--start</option>|<option>--stop</option>|<option>--restart</option>|<option>--status</option>|<option>--help</option>|<option>-h</option>|<option>--quiet</option>|<option>-q</option></arg>
<arg choice="req" rep="repeat"><replaceable>instancename</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
Expand Down Expand Up @@ -54,6 +54,13 @@
</listitem>
</varlistentry>

<varlistentry>
<term><option>--status</option></term>
<listitem>
<para>Show the status of the indexer for the specified instances.</para>
</listitem>
</varlistentry>

<varlistentry>
<term><option>--quiet|-q</option></term>
<listitem>
Expand Down
19 changes: 19 additions & 0 deletions debian/scripts/koha-indexer
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ $scriptname -h|--help
--start Start the indexer daemon for the specified instances
--stop Stop the indexer daemon for the specified instances
--restart Restart the indexer daemon for the specified instances
--status Show the status of the indexer for the specified instances
--quiet|-q Make the script quiet about non existent instance names
(useful for calling from another scripts).
--help|-h Display this help message
Expand Down Expand Up @@ -138,6 +139,19 @@ restart_indexer()
fi
}

indexer_status()
{
local name=$1

if is_indexer_running ${name}; then
log_daemon_msg "Indexer running for ${name}"
log_end_msg 0
else
log_daemon_msg "Indexer not running for ${name}"
log_end_msg 3
fi
}

set_action()
{
if [ "$op" = "" ]; then
Expand Down Expand Up @@ -168,6 +182,9 @@ while [ $# -gt 0 ]; do
--restart)
set_action "restart"
shift ;;
--status)
set_action "status"
shift ;;
-*)
die "Error: invalid option switch ($1)" ;;
*)
Expand Down Expand Up @@ -221,6 +238,8 @@ if [ $# -gt 0 ]; then
"restart")
restart_indexer $name
;;
"status")
indexer_status $name
esac

else
Expand Down

0 comments on commit 38a7e5e

Please sign in to comment.