LibreOffice/online
1
0
Fork 0
mirror of https://github.com/LibreOffice/online.git synced 2025-07-29 12:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced pipe with websocket based on Unix socket in communication with ForKit

Browse Source 
Change-Id: I80f1a4e84ca6820503966a8ee5d9958a150eac14
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91585
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Gabriel Masei
2020-04-02 18:11:36 +03:00
committed by Michael Meeks
parent b045fa90f2
commit 70af76e28c
8 changed files with 335 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wsd/Admin.hpp
View File

@ -16,6 +16,7 @@
#include "Log.hpp"
#include "net/WebSocketHandler.hpp"
#include "LOOLWSD.hpp"
class Admin;
@ -91,7 +92,6 @@ public:
void rmDoc(const std::string& docKey);
void setForKitPid(const int forKitPid) { _forKitPid = forKitPid; _model.setForKitPid(forKitPid);}
void setForKitWritePipe(const int forKitWritePipe) { _forKitWritePipe = forKitWritePipe; }
/// Callers must ensure that modelMutex is acquired
AdminModel& getModel();
@ -156,7 +156,6 @@ private:
/// the Admin Poll thread.
AdminModel _model;
int _forKitPid;
int _forKitWritePipe;
size_t _lastTotalMemory;
size_t _lastJiffies;
uint64_t _lastSentCount;