strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
libreoffice-online/loolwsd/Makefile.am

33 lines
1.2 KiB
Text
Raw Normal View History

Autofooize
2015-03-09 04:11:15 -05:00
bin_PROGRAMS = loolwsd
Use dist_bin_SCRIPTS, not bin_SCRIPTS Otherwise we won't get loolwsd-systemplate-setup in the tarball.
2015-05-19 05:58:53 -05:00
dist_bin_SCRIPTS = loolwsd-systemplate-setup
Rename the systemplate setup script to better name and install it It was a bit misleading to have "chroot" in the name of the script as it isn't a chroot jail as such that the script is setting up, but a *template* that will be copied (hardlinked) into each chroot jail. The script should be installed, so that a loolwsd package can include it. We don't want to loolwsd use to depend on having the sources available, obviously.
2015-05-19 05:20:16 -05:00
Start on load testing Add a new program, loadtest, that runs a requested number of client sessions in parallel to a loolwsd server. A client session loads one of a list of test documents, and does some operations on it. Move the getTokenInteger() and getTokenString() functions out from LOOLSession into a new namespace LOOLProtocol, as they are neeeded also in the loadtest program. Add, also in LOOLProtocol, functions to parse some of the messages from the server. (In general that is done in client JavaScript code, of course; only for testing purposes needed in C++ code.)
2015-03-26 09:49:07 -05:00
loolwsd_SOURCES = LOOLWSD.cpp LOOLSession.cpp TileCache.cpp Util.cpp LOOLProtocol.cpp
Use separate child processes for LibreOfficeKit For now, each LOOL client has a separate child process (or none at all, if it has accessed only information found in the cache). This will obviously have to chnage to handle collaboration. Etc. The parent process talks the same Websocket protocol with the child processes. When there is a child process for a client, traffic from the client is forwarded as such to the child process and vice versa.
2015-03-17 18:56:15 -05:00
Add a new minimal non-GUI LOKit test program For easier debugging of the LO code invoked through LibreOfficeKit, with is no GUI stuff complicating debugging.
2015-03-28 06:22:32 -05:00
noinst_PROGRAMS = loadtest connect lokitclient
Start on load testing Add a new program, loadtest, that runs a requested number of client sessions in parallel to a loolwsd server. A client session loads one of a list of test documents, and does some operations on it. Move the getTokenInteger() and getTokenString() functions out from LOOLSession into a new namespace LOOLProtocol, as they are neeeded also in the loadtest program. Add, also in LOOLProtocol, functions to parse some of the messages from the server. (In general that is done in client JavaScript code, of course; only for testing purposes needed in C++ code.)
2015-03-26 09:49:07 -05:00
loadtest_SOURCES = LoadTest.cpp Util.cpp LOOLProtocol.cpp
Intermediate commit of start on transporting sockets to child process Will be needed if we want loolwsd to run on Windows. Then we will have one process receiving the connections from WebSocket clients and sending the accepted connection sockets to child processes thatr might be already running, either because they have been "pre-forked", or because of a collaboration scenario where new clients join a session working on a document. But initially we will write this as if for Unix only, so development of this migratory socket stuff is paused for now. (And it isn't even clear whether the API design so far is a good idea and elegantly implementable.)
2015-03-16 05:25:47 -05:00
Now the chroot etc re-work is getting closer to working Works now for the trivial 'connect' test program. Still need to add pre-spawning of a new child process as soon as an existing one from the pool has been taking into use. And need to test with the actual JS client.
2015-04-14 09:50:38 -05:00
connect_SOURCES = Connect.cpp Util.cpp LOOLProtocol.cpp
Add trivial test program for sending commands to the LOOL server
2015-03-27 09:23:20 -05:00
Add a new minimal non-GUI LOKit test program For easier debugging of the LO code invoked through LibreOfficeKit, with is no GUI stuff complicating debugging.
2015-03-28 06:22:32 -05:00
lokitclient_SOURCES = LOKitClient.cpp Util.cpp
Include also headers in the tarball
2015-05-15 05:37:48 -05:00
noinst_HEADERS = LOKitHelper.hpp LOOLProtocol.hpp LOOLSession.hpp LOOLWSD.hpp LoadTest.hpp TileCache.hpp Util.hpp \
bundled/include/LibreOfficeKit/LibreOfficeKit.h bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
bundled/include/LibreOfficeKit/LibreOfficeKitInit.h bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
Use separate child processes for LibreOfficeKit For now, each LOOL client has a separate child process (or none at all, if it has accessed only information found in the cache). This will obviously have to chnage to handle collaboration. Etc. The parent process talks the same Websocket protocol with the child processes. When there is a child process for a client, traffic from the client is forwarded as such to the child process and vice versa.
2015-03-17 18:56:15 -05:00
clean-cache:
# Intentionally don't use "*" below... Avoid risk of accidentally running rm -rf /*
Do remove also the first level of subdirectories
2015-03-27 07:52:30 -05:00
test -n "@LOOLWSD_CACHEDIR@" && rm -rf "@LOOLWSD_CACHEDIR@"/[0-9a-f]
Work in progress: "pre-forking", chroot, etc. Non-working state Lots of changes to the server code, LOOLWSD and LOOLSession mainly. This is an intermediate commit.
2015-04-08 09:22:42 -05:00
Rename the systemplate setup script to better name and install it It was a bit misleading to have "chroot" in the name of the script as it isn't a chroot jail as such that the script is setting up, but a *template* that will be copied (hardlinked) into each chroot jail. The script should be installed, so that a loolwsd package can include it. We don't want to loolwsd use to depend on having the sources available, obviously.
2015-05-19 05:20:16 -05:00
# After building loolwsd, set its capabilities to allow chroot(). Dot
# it already after a plain 'make' to allow for testing without
# installing.
Makefile: fix autoreconf warning Makefile.am:18: warning: deprecated feature: target 'SETCAP' overrides 'SETCAP$(EXEEXT)' Makefile.am:18: change your target to read 'SETCAP$(EXEEXT)' /usr/share/automake-1.13/am/program.am: target 'SETCAP$(EXEEXT)' was defined here Makefile.am:1: while processing program 'SETCAP'
2015-04-24 10:16:46 -05:00
all-local: loolwsd
We have setcap only on Linux Use setuid root otherwise. (But note that the portablity to other Unixes is a work in progress, and for instance it is known that this doesn't work on OS X yet.)
2015-05-04 12:55:35 -05:00
if test `uname -s` = Linux; then \
We need CAP_FOWNER, too, on newer Linuxes to be able to hardlink the LO files At least when not running as the owner of those files. Refactor the capability dropping so that we can separately drop the CAP_FOWNER and CAP_SYS_CHROOT capabilities. The child process never needs CAP_FOWNER and the parent process never needs CAP_SYS_CHROOT.
2015-05-19 05:48:20 -05:00
sudo @SETCAP@ cap_fowner,cap_sys_chroot=ep loolwsd; \
We have setcap only on Linux Use setuid root otherwise. (But note that the portablity to other Unixes is a work in progress, and for instance it is known that this doesn't work on OS X yet.)
2015-05-04 12:55:35 -05:00
else \
sudo chown root loolwsd && sudo chmod u+s loolwsd; \
fi
Rename the systemplate setup script to better name and install it It was a bit misleading to have "chroot" in the name of the script as it isn't a chroot jail as such that the script is setting up, but a *template* that will be copied (hardlinked) into each chroot jail. The script should be installed, so that a loolwsd package can include it. We don't want to loolwsd use to depend on having the sources available, obviously.
2015-05-19 05:20:16 -05:00
Reference in a new issue Copy permalink