Commit graph

1660 commits

Author SHA1 Message Date
Henry Castro
d20e9399fc loolwsd: revert, refactor lokit Document
I did not consider shared document case.
2016-01-09 07:27:57 -04:00
Henry Castro
f3735f145f loolwsd: force kills a child with abnormal state. 2016-01-08 23:34:34 -04:00
Henry Castro
584e68e6d1 loolwsd: remove expired session URL cached 2016-01-08 19:05:58 -04:00
Andras Timar
dc23d5f91e loolwsd: deb rules: fix build of tests, and do not run tests 2016-01-08 22:42:56 +01:00
Henry Castro
82b3b25d0a loolwsd: refactor lokit Document
+ Every lokit process acquire an unique URL document to open it
+ Every lokit process acquired with an URL document could open multiple view of the same URL document
+ Every lokit process acquire a new unique URL document if and only if no exists opened documents.
+ if a lokit process dies is an abnormal state, and it should take actions to recovery session document.
+ An initial lokit process with no acquire URL document is in waiting state.
2016-01-08 10:37:48 -04:00
Jan Holesovsky
8043952c84 loleaflet: Strip trailing '/'s from options.webserver. 2016-01-08 12:05:20 +01:00
Miklos Vajna
20488cce86 loleaflet: document border shadow config option 2016-01-08 11:52:33 +01:00
Jan Holesovsky
f74db161dd loolwsd: Change the group too. 2016-01-08 09:25:21 +01:00
Jan Holesovsky
5aded99950 loolwsd: Cleanup child-roots in postinst (as we do in .rpm's too). 2016-01-08 09:25:21 +01:00
Jan Holesovsky
475436e66b loolwsd: Remove the cache content after installation.
The new versions may change the behaviour substantially, let's be on the safe
side.
2016-01-08 09:25:21 +01:00
Miklos Vajna
8e5841cc58 loolwsd: -Werror,-Wpointer-bool-conversion
error: address of array 'dir_proc->d_name' will always evaluate to 'true'

Henry says this is the correct fix.
2016-01-08 09:08:25 +01:00
Henry Castro
ab1a3a147e loolwsd: not necessary to find session
Every lokit instances has a unique URL, that could contain
multiple views.
2016-01-07 23:43:09 -04:00
Henry Castro
2c7b4490ec loolwsd: ensure to remove the connection of unloaded document 2016-01-07 23:24:40 -04:00
Jan Holesovsky
4c3896c32e loleaflet: No need to use the last zoom in fitWithZoom().
This makes it a stable algorithm.

This reverts commit 749d707c2f2be64424c0f3f9e105f90e22592a41.
2016-01-07 22:56:12 +01:00
Ozcan Esen
f3778421b1 loleaflet: fix fitWidthZoom inconsistency
Change-Id: I511112d05de2b2734d7d2b2f905a3ba797dcca5f
2016-01-07 22:56:12 +01:00
Jan Holesovsky
07a3b6994e loleaflet: Add a button for testing fitWidthZoom(). 2016-01-07 22:56:12 +01:00
Jan Holesovsky
1d99285294 loleaflet: One more place that needs options.webserver. 2016-01-07 22:56:12 +01:00
Henry Castro
b213464b3d loolwsd: ensure unique URL per lokit process 2016-01-07 14:55:11 -04:00
Henry Castro
49fbf1126b loolwsd: fix search document. 2016-01-07 12:14:52 -04:00
Miklos Vajna
e1a3a86ff3 loolwsd: default initialization of an object of const type 'const struct ...
... _end_marker' without a user-provided default constructor

Add one to make clang happy.
2016-01-07 15:10:34 +01:00
Miklos Vajna
f0090d107c loolwsd: -Werror,-Wshadow 2016-01-07 15:09:43 +01:00
Miklos Vajna
feb8648f05 loolwsd: adding 'int' to a string does not append to the string 2016-01-07 15:06:16 +01:00
Jan Holesovsky
558e08af58 loleaflet: Introduce a 'webserver' option for the http access to loolwsd.
When proxying, the websocket may be hidden behind another URL, so this allows
an explicit setting.
2016-01-07 12:36:16 +01:00
Miklos Vajna
956f470e5f loolwsd: fix -Werror,-Winconsistent-missing-override 2016-01-07 08:35:45 +01:00
Ashod Nakashian
4a4583e711 loolwsd: documentation updated with architecture, filesystem, and workflow
Change-Id: If5268cd87794493d63d8175b9da10e6242d6e3f0
Reviewed-on: https://gerrit.libreoffice.org/21186
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:59:06 +00:00
Ashod Nakashian
06c20923c5 loolwsd: Kit is given the jailed path
Change-Id: I5b475798c7f654aaa3e0032332d5aa97a103a4c8
Reviewed-on: https://gerrit.libreoffice.org/21185
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:58:08 +00:00
Ashod Nakashian
a7556a7c1e loolwsd: new Document class to manage the lifetime of a document
Change-Id: I8596d0f2514106e384bc6519ce05028753026678
Reviewed-on: https://gerrit.libreoffice.org/21184
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:57:25 +00:00
Ashod Nakashian
7f9485e318 loolwsd: jailId now static member
Change-Id: I7142038d421d642a3e9dfd3e1069c7401ec7db5c
Reviewed-on: https://gerrit.libreoffice.org/21183
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:56:25 +00:00
Ashod Nakashian
0b5bc5f244 loolwsd: random jailId dir created by WSD and renamed childId -> jailId
Change-Id: Ib5ce65c578c0c7fd3dbf81628906cd17728fb3ff
Reviewed-on: https://gerrit.libreoffice.org/21182
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:56:01 +00:00
Ashod Nakashian
b0cd3e5a46 loolwsd: spawn one broker and one only
Change-Id: I9ec23e7e9e9672e5e4e6d55b7a79e6db1f617e45
Reviewed-on: https://gerrit.libreoffice.org/21181
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:54:44 +00:00
Ashod Nakashian
0cdb8c931f loolwsd: logs
Change-Id: Ib964578ce84eb3dd4b96d483b0e8b53c6cfac853
Reviewed-on: https://gerrit.libreoffice.org/21180
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:53:56 +00:00
Ashod Nakashian
900c344a7e loolwsd: refactored JailedDocumentRoot path
Change-Id: Ibee16e6ebde0ae1945be53903a0b0bad4f3300ed
Reviewed-on: https://gerrit.libreoffice.org/21179
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:53:39 +00:00
Ashod Nakashian
cf65588031 loolwsd: more local ClientPortNumber
Change-Id: I2ce649a8f880bd0ec3bded715b1d8864e176b935
Reviewed-on: https://gerrit.libreoffice.org/21178
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07 05:52:24 +00:00
Ashod Nakashian
2d385d697e Protocol versioning added and documented
Change-Id: I6e1df89c7330052bd2d442a42c0b24c8ae4facf6
Reviewed-on: https://gerrit.libreoffice.org/21168
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 17:06:47 +00:00
Ashod Nakashian
9285f50c6b loolwsd: kit instance forkCounter now atomic
Change-Id: I04470220b83940319ff1a0fee865201433f44016
Reviewed-on: https://gerrit.libreoffice.org/21167
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 17:04:42 +00:00
Jan Holesovsky
28646c1a53 loolwsd: Answer the PING's with proper PONG's. 2016-01-06 17:19:21 +01:00
Ashod Nakashian
5b3c9bff2e loolwsd: tabs -> spaces
Change-Id: I93619e2d5f93d104d34af9bda60f87e300e39963
Reviewed-on: https://gerrit.libreoffice.org/21164
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:31:02 +00:00
Ashod Nakashian
7bf3fe843a loolwsd: more exception handling
Change-Id: I7ac694395e2c231565bd84a7cd7813498dba387f
Reviewed-on: https://gerrit.libreoffice.org/21163
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:30:46 +00:00
Ashod Nakashian
87d45ff333 loolwsd: don't timeout client socket
Change-Id: I22ca1834e22efbe01cc3e8cb78be5d0b2fbfcf4c
Reviewed-on: https://gerrit.libreoffice.org/21162
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:25:25 +00:00
Ashod Nakashian
f9cfdd9021 loolwsd: reuse QueueHandler
Change-Id: I90dd0cc1457604d85ec82c98af9a457f44968b0d
Reviewed-on: https://gerrit.libreoffice.org/21161
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:24:58 +00:00
Ashod Nakashian
6327f806de loolwsd: support relative lokit path to configure
Change-Id: I19f76cbd39fd268145fa6cf6462f3fc940e06ff5
Reviewed-on: https://gerrit.libreoffice.org/21160
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:24:18 +00:00
Ashod Nakashian
c3826587e1 loolwsd: moved QueueHandler into own file
Change-Id: I281a9bd12731340673cb66f1f2ac6a133cbe71d0
Reviewed-on: https://gerrit.libreoffice.org/21159
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:23:39 +00:00
Ashod Nakashian
ea1415de75 loolwsd: improved HTTP Request Handler
Change-Id: I1ad4359732c7b5ee9fc8743ebc60e1c94c304dcc
Reviewed-on: https://gerrit.libreoffice.org/21158
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:22:59 +00:00
Ashod Nakashian
a5cca41b35 loolwsd: logging improvements in LOOLSession.
Change-Id: Ia5029bc55be0bf0f1a3282db103515ae22fd90bd
Reviewed-on: https://gerrit.libreoffice.org/21157
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:22:13 +00:00
Ashod Nakashian
c2c41ceb63 loolwsd: refactored HttpRequestHandler
Change-Id: Ie785d814aff1d28634c8933511c4a5a4a4f5cebc
Reviewed-on: https://gerrit.libreoffice.org/21156
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:21:53 +00:00
Ashod Nakashian
04d263cba0 loleaflet: .gitignore load_test dirs
Change-Id: I03bee4676f50e1e88ffd29c84962d7e5f0977381
Reviewed-on: https://gerrit.libreoffice.org/21155
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:21:01 +00:00
Andras Timar
ab07fa2948 loolwsd: find system Poco libs (for real now) 2016-01-06 12:59:25 +01:00
Andras Timar
faa1fa47c7 loowsd: typo: falied -> failed 2016-01-06 11:11:23 +01:00
Andras Timar
e41e25a18c loolwsd: bccu#1397 fix dlopening LO in loolbroker in mergedlibs case 2016-01-06 10:38:09 +01:00
Miklos Vajna
4a5e4ac147 loolwsd: avoid copying non-Poco libs when looking for system Poco libs
10:05 < tml> vmiklos: doesn't your latest commit to online massively increase the number of .so files handled?

Indeed, the systemplate size was about 1.2GB, now it's back to around
500MB for my setup.
2016-01-06 10:18:50 +01:00