Tor Lillqvist
eade187ebb
Bin pointless logging
...
We logged effectively the same information a few lines earlier.
2015-04-22 21:50:04 +03:00
Tor Lillqvist
59bd08299c
_childId is used only in MasterProcessSession
2015-04-22 21:49:53 +03:00
Tor Lillqvist
08f53df08a
_childIdToChildSession[childId] is not used
2015-04-22 21:49:37 +03:00
Tor Lillqvist
e83559795d
Mention that sudo is used
2015-04-22 21:49:23 +03:00
Tor Lillqvist
8534aebf8e
Only the MasterProcessSession class uses a tile cache
2015-04-22 21:49:12 +03:00
Tor Lillqvist
d94b494c0c
Check if the peer MasterProcessSession has a tile cache yet
2015-04-22 21:48:48 +03:00
Tor Lillqvist
54d106f47b
Factor out WebSocket::shutdown() ignoring IOException
2015-04-22 21:48:42 +03:00
Tor Lillqvist
6b7dcdb544
Typo
2015-04-22 21:48:35 +03:00
Tor Lillqvist
520236fb7e
Updates
2015-04-22 21:48:27 +03:00
Tor Lillqvist
a0292468da
Catch (and ignore) Poco::IOException in a couple of places
...
There probably are more places where I should catch those and act
appropriately. At least in these places, where the websocket connection is
already closed, or being closed, anyway, the right thing to do is just to
ignore exceptions, which are generated from attempts to write to an already
closed Poco WebSocket, for instance.
2015-04-22 21:48:14 +03:00
Tor Lillqvist
fcea475bb5
Use separate classes derived from LOOLSession for parent and child processes
...
Work in progress. Does not work properly yet.
2015-04-22 21:48:04 +03:00
Tor Lillqvist
fda13c6c74
Tweak temporary timing parameters a bit while hacking
2015-04-22 21:47:53 +03:00
Tor Lillqvist
84eff99fde
Add --help option
2015-04-22 21:47:38 +03:00
Tor Lillqvist
faec3cd961
We indeed don't need the signalfd stuff, I hope
...
As such it worked, but if we can manage with simpler code, no need to use it.
2015-04-22 21:47:20 +03:00
Tor Lillqvist
a63f797fff
Call shutdown on the peer's websocket when the session to the client dies
...
Also, seems that calling LOKitDocument::destroy() (in the child process's
LOOLSession dtor) causes crashes, avoid that. The can be little need for any
cleanup as the process is about to exit anyway, and the user profile is a
temporary one that will be binned.
2015-04-22 21:47:13 +03:00
Tor Lillqvist
02f12402bf
This was what I meant
...
But actually I wonder why I thought I would need signalfd at all; wouldn't it
be enough to just loop in the undertaker thread, calling waitpid(), as long as
there are child processes? I'll try after this commit.
(Besides, I now notice that when I client disconnects, we don't close the
websocket to the child process, so it never goes away. Will fix that.)
2015-04-22 21:46:56 +03:00
Tor Lillqvist
59e4d4d25d
This is done
2015-04-22 21:46:50 +03:00
Tor Lillqvist
39b6258aa9
Clean up the jail after the prisoner has died
2015-04-22 21:46:33 +03:00
Tor Lillqvist
291710cc1c
Typo
2015-04-22 21:46:23 +03:00
Tor Lillqvist
af3545b897
No need for the SLEEPFORDEBUGGER thing any more
...
As the child processes are pre-spawned and just hang around waiting, there is
ample time to attach one in a debugger in a controlled debugging scenario
anyway.
2015-04-22 21:46:04 +03:00
Tor Lillqvist
27a680457e
Pre-spawn a new child when we take one into use
2015-04-22 21:45:57 +03:00
Tor Lillqvist
1b32383875
Improve help messages
2015-04-22 21:45:47 +03:00
Tor Lillqvist
b760359bda
Terminology change: s/fork/spawn
...
We aren't doing any fork-but-not-exec trick anyway, just a straightforward
start of a child process.
2015-04-22 21:45:31 +03:00
Tor Lillqvist
a2e2102ad1
Call dispatchChild() only if needed
2015-04-22 21:45:22 +03:00
Tor Lillqvist
c33d3a3aae
Add a couple of items
2015-04-22 21:45:06 +03:00
Tor Lillqvist
acbad93ac7
Update README
2015-04-22 21:44:53 +03:00
Tor Lillqvist
d513536cfe
Must seed the RNG explicitly
...
Otherwise it uses a timestamp with one-second granularity as seed, and thus
most of the child processes pre-spawned at start will use the same seed, which
causes breakage.
2015-04-22 21:44:42 +03:00
Tor Lillqvist
3abb6d0307
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-22 21:44:17 +03:00
Tor Lillqvist
8800dd46e1
Fix typo and bin leftover FOO debug output
2015-04-22 21:43:55 +03:00
Tor Lillqvist
652580a761
Another intermediate commit, code still in a non-working state
2015-04-22 21:43:44 +03:00
Tor Lillqvist
a4480e2a8e
Add "sleep <n>" pseudo-request
2015-04-22 21:43:32 +03:00
Tor Lillqvist
0a60ea9dcc
Bump Emacs fill-column to 100
...
The default 70 is so last century.
2015-04-22 21:43:11 +03:00
Tor Lillqvist
7f50f06bf4
Add some comments
2015-04-22 21:42:47 +03:00
Tor Lillqvist
4c7b5a39e3
master LibreOffice no longer does the "restart required" thing when used from LOKit
2015-04-22 21:42:28 +03:00
Tor Lillqvist
f9d93ea57c
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-22 21:42:17 +03:00
Tor Lillqvist
defbb6a809
Remove write of superfluous empty line
2015-04-22 21:42:09 +03:00
Tor Lillqvist
6950f7d841
Adapt to changed LibreOfficeKitDocument::postUnoCommand() API
2015-04-22 21:41:49 +03:00
Jan Holesovsky
44553f82c0
loolwsd: Don't even start when the cache dir is not available.
2015-04-21 15:51:28 +02:00
Jan Holesovsky
4715df9587
Reformatted loolwsd README.
2015-04-21 12:48:17 +02:00
Tor Lillqvist
c72f197e71
Handle LOK_CALLBACK_STATE_CHANGED
2015-04-14 14:51:36 +03:00
Tor Lillqvist
32ec786180
Update
2015-04-14 12:54:41 +03:00
Mihai Varga
7d66119532
Command type handler for selectText, selectGraphic, key, mouse
2015-04-13 20:42:44 +03:00
Tor Lillqvist
803ace146b
Some compilers seem very picky about ignoring return values
2015-04-10 12:51:42 +03:00
Tor Lillqvist
e6ddb042cd
WaE: ignoring return value
2015-04-10 12:40:13 +03:00
Tor Lillqvist
bf709edf08
Adapt for older libpng
2015-04-10 12:39:12 +03:00
Tor Lillqvist
aedea4229f
Call LibreOfficeKitDocument::initializeForRendering()
2015-04-10 12:21:28 +03:00
Tor Lillqvist
06d98ec0b7
This is C++
2015-04-10 01:25:48 +03:00
Michael Meeks
abec49b4bc
memcpy in string.h
2015-04-09 14:38:20 +01:00
Tor Lillqvist
ceae121b16
Can remove this, too
2015-03-28 13:58:15 +02:00
Tor Lillqvist
6d9f298ee9
Prefer C++ std headers
2015-03-28 13:57:10 +02:00
