Bug 15338 - Remove inconsistency in location of SIPServer.pm
Summary: Remove inconsistency in location of SIPServer.pm
Status: Patch doesn't apply
Alias: None
Product: Koha
Classification: Unclassified
Component: SIP2 (show other bugs)
Version: Main
Hardware: All All
: P5 - low enhancement (vote)
Assignee: Martin Renvoize
QA Contact: Testopia
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-12-09 11:49 UTC by Colin Campbell
Modified: 2023-01-26 12:18 UTC (History)
4 users (show)

See Also:
Change sponsored?: ---
Patch complexity: ---
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:


Attachments
Proposed patch (20.43 KB, patch)
2015-12-09 11:56 UTC, Colin Campbell
Details | Diff | Splinter Review
Supplementary patch (15.84 KB, patch)
2015-12-09 12:19 UTC, Colin Campbell
Details | Diff | Splinter Review
Bug 15338: Move SIPServer to bin directory (2.54 KB, patch)
2021-03-30 13:25 UTC, Martin Renvoize
Details | Diff | Splinter Review
Bug 15338: Fix indentation and comments in SIPServer (17.06 KB, patch)
2021-03-30 13:25 UTC, Martin Renvoize
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Colin Campbell 2015-12-09 11:49:56 UTC
For historical reasons the SIPServer has not been located in the bin directory but in the lib hierarchical - these reasons no longer apply and this is only a source of confusion and "special case" workarounds. Relocate the server to its logical place in the hierarchy
Comment 1 Colin Campbell 2015-12-09 11:56:13 UTC
Created attachment 45525 [details] [review]
Proposed patch

Testing: Using the amended start up and shutdown scripts the server should behave as before this patch was applied
Comment 2 Colin Campbell 2015-12-09 12:19:09 UTC
Created attachment 45526 [details] [review]
Supplementary patch

Supplementary patch removes obsolete comments and applies consistent formatting to the code. Adds a comment to indicate Net::Server::Fork is a valid alternative to PreFork
Comment 3 Chris Cormack 2016-06-03 12:18:14 UTC
Applying: Bug 15338 move SIPServer to bin directory
fatal: sha1 information is lacking or useless (C4/SIP/SIPServer.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 15338 move SIPServer to bin directory
Comment 4 Martin Renvoize 2021-03-30 13:25:08 UTC
Created attachment 119002 [details] [review]
Bug 15338: Move SIPServer to bin directory

SIPServer should reside like other programs in the bin
directory rather than lurking in modules

removed the pm suffix which confused some users
sip_run.sh can now be simplified and not fail
because of misuse of path definition as a directory

removed the unnecessary sourcing of .bash_profile in shutdown
(what if you dont have a bash_profile?)

SIP modules are now in standard lib path so
Server does not need to set its own lib
Comment 5 Martin Renvoize 2021-03-30 13:25:11 UTC
Created attachment 119003 [details] [review]
Bug 15338: Fix indentation and comments in SIPServer

Supplemental patch which takes advantage of the relocation
of the program to apply a consistent indentation to the code
also removes comments arising from the confusion resulting
from the program's name and location

Add a comment indicating that this code will work under
other flavours of Net::Server as well as PreFork
Comment 6 Lucas Gass 2022-07-29 22:44:38 UTC
No longer applies cleanly to master