Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

admin: add dockey to adddoc message #9139

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion wsd/AdminModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,8 @@ void AdminModel::addDocument(const std::string& docKey, pid_t pid,
}

const std::string& wopiHost = wopiSrc.getHost();
oss << memoryAllocated << ' ' << wopiHost << ' ' << isViewReadOnly << ' ' << wopiSrc.toString();
oss << memoryAllocated << ' ' << wopiHost << ' ' << isViewReadOnly << ' ' << wopiSrc.toString()
<< ' ' << Util::decodeURIComponent(docKey);
if (COOLWSD::getConfigValue<bool>("logging.docstats", false))
{
std::string docstats = "docstats : adding a document : " + filename
Expand Down
6 changes: 5 additions & 1 deletion wsd/protocol.txt
Original file line number Diff line number Diff line change
Expand Up @@ -917,13 +917,17 @@ Commands marked with [*] are notifications that are delivered only if client is
subscribed to these commands using `subscribe` (see client->admin
section). Others are just response messages to some client command.

[*] adddoc <pid> <filename> <sessionid> <username> <userid> <memory consumed> <wopiHost> <isViewReadOnly> <wopiSrc>
[*] adddoc <pid> <filename> <sessionid> <username> <userid> <memory consumed>
<wopiHost> <isViewReadOnly> <wopiSrc> <dockey>

<pid> process id hosting the document
<filename> URL encoded name of the file
<sessionid> string identifying the view of this document
<memory consumed> RSS of <pid> in kilobytes
<wopihost> storage host on which document exist
<isViewReadOnly> if the view is readonly
<wopiSrc> wopisrc of the document
<dockey> unique identifying key of the document

[*] rmdoc <pid> <sessionid>

Expand Down
Loading