Makefile.am | 26 +++++-------------------
configure.ac | 15 -------------
ios/Mobile/Document.mm | 6 -----
ios/Mobile/Resources/Settings.bundle/Root.plist | 10 ---------
ios/config.h.in | 3 --
ios/ios.mm | 8 -------
loolwsd.xml.in | 1
test/run_unit.sh.in | 4 ---
wsd/DocumentBroker.cpp | 11 ----------
wsd/DocumentBroker.hpp | 1
wsd/LOOLWSD.cpp | 17 ---------------
wsd/LOOLWSD.hpp | 2 -
12 files changed, 6 insertions(+), 98 deletions(-)
New commits:
commit 8f71365f0f51c6f2b4144fd7c5674d23363a83bf
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Fri Feb 15 21:22:41 2019 +0200
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Fri Feb 15 21:36:16 2019 +0100
Remove unnecessary leftovers after Michael's removal of the on-disk tile
cache
Change-Id: I435679b48f90d2580bb9c5c86a26c9a1d43c5b59
Reviewed-on: https://gerrit.libreoffice.org/67885
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/Makefile.am b/Makefile.am
index 401ad72e6..2a6a1ef5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -270,15 +270,11 @@ $(SYSTEM_STAMP) : ${top_srcdir}/loolwsd-systemplate-setup
@JAILS_PATH@ :
mkdir -p $@
-@TILECACHE_PATH@ :
- mkdir -p $@
-
clean-local:
if test "z@JAILS_PATH@" != "z"; then rm -rf "@JAILS_PATH@"; fi
if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@";
fi
- if test "z@TILECACHE_PATH@" != "z"; then rm -rf "@TILECACHE_PATH@"; fi
-run: all @TILECACHE_PATH@ @JAILS_PATH@
+run: all @JAILS_PATH@
@echo "Launching loolwsd"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -287,14 +283,13 @@ run: all @TILECACHE_PATH@ @JAILS_PATH@
@echo
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
- --o:tile_cache_path="@TILECACHE_PATH@" \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
--o:logging.file[@enable]=true --o:logging.level=trace
-run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@
+run-valgrind: all @JAILS_PATH@
@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -303,14 +298,13 @@ run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@
valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
- --o:tile_cache_path="@TILECACHE_PATH@" \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
--o:logging.file[@enable]=false
--o:logging.level=trace
-run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@
+run-gdb: all @JAILS_PATH@
@echo "Launching loolwsd under valgrind's callgrind"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -320,14 +314,13 @@ run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@
./loolwsd --o:security.capabilities="false" \
--o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
- --o:tile_cache_path="@TILECACHE_PATH@" \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
--o:logging.file[@enable]=false
--o:logging.level=error
-run-callgrind: all @TILECACHE_PATH@ @JAILS_PATH@
+run-callgrind: all @JAILS_PATH@
@echo "Launching loolwsd under valgrind's callgrind"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -337,14 +330,13 @@ run-callgrind: all @TILECACHE_PATH@ @JAILS_PATH@
./loolwsd --o:security.capabilities="false" \
--o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
- --o:tile_cache_path="@TILECACHE_PATH@" \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
--o:logging.file[@enable]=false
--o:logging.level=error
-run-strace: all @TILECACHE_PATH@ @JAILS_PATH@
+run-strace: all @JAILS_PATH@
@echo "Launching loolwsd under strace"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -354,7 +346,6 @@ run-strace: all @TILECACHE_PATH@ @JAILS_PATH@
./loolwsd --o:security.capabilities="false" \
--o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
- --o:tile_cache_path="@TILECACHE_PATH@" \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
@@ -367,18 +358,13 @@ SYSTEM_STAMP =
endif
-clean-cache cache-clean:
-# Intentionally don't use "*" below... Avoid risk of accidentally running rm
-rf /*
- test -n "@LOOLWSD_CACHEDIR@" && rm -rf "@LOOLWSD_CACHEDIR@"/[0-9a-f]
- test -n "@TILECACHE_PATH@" && rm -rf "@TILECACHE_PATH@"/[0-9a-f]
-
# After building loolforkit, set its capabilities as required. Do it
# already after a plain 'make' to allow for testing without
# installing. When building for packaging, no need for this, as the
# capabilities won't survive packaging anyway. Instead, handle it when
# installing the RPM or Debian package.
-all-local: loolforkit loolmount @TILECACHE_PATH@ @JAILS_PATH@ $(SYSTEM_STAMP)
+all-local: loolforkit loolmount @JAILS_PATH@ $(SYSTEM_STAMP)
if ENABLE_SETCAP
sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolforkit
sudo @SETCAP@ cap_sys_admin=ep loolmount
diff --git a/configure.ac b/configure.ac
index b5dfc2ca6..2f05fd972 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,7 +410,6 @@ if test -n "$with_lo_path"; then
version_file="$with_lo_path/program/versionrc"
if test -f $version_file; then
JAILS_PATH="\${abs_top_builddir}/jails"
- TILECACHE_PATH="\${abs_top_builddir}/cache"
SYSTEMPLATE_PATH="\${abs_top_builddir}/systemplate"
have_lo_path=true
lo_msg="test against $LO_PATH"
@@ -426,7 +425,6 @@ fi
AC_SUBST(LO_PATH)
AC_DEFINE_UNQUOTED([LO_PATH],["$LO_PATH"],[Path to LibreOffice installation])
AC_SUBST(JAILS_PATH)
-AC_SUBST(TILECACHE_PATH)
AC_SUBST(SYSTEMPLATE_PATH)
AM_CONDITIONAL(HAVE_LO_PATH,[test "$have_lo_path" = "true"])
@@ -625,23 +623,10 @@ AS_IF([test `uname -s` = "Linux"],
fi
])
-AS_IF([test "$ENABLE_IOSAPP" != "true"],
- [test "$prefix" = NONE && prefix=$ac_default_prefix
- LOOLWSD_CACHEDIR=${localstatedir}/cache/${PACKAGE}
- while :; do
- oldvalue=$LOOLWSD_CACHEDIR
- LOOLWSD_CACHEDIR=`eval echo $LOOLWSD_CACHEDIR`
- test $LOOLWSD_CACHEDIR = $oldvalue && break
- done
- ])
-
# need this after the other stuff that uses the compiler because we don't want
to run configure-tests with the plugins enabled
AS_IF([test -n "$with_compiler_plugins"],
[CPPFLAGS="$CPPFLAGS -Xclang -load -Xclang
${with_compiler_plugins}/compilerplugins/obj/plugin.so -Xclang -add-plugin
-Xclang loplugin -Xclang -plugin-arg-loplugin -Xclang
--lool-base-path=\${abs_top_srcdir}"])
-AC_DEFINE_UNQUOTED([LOOLWSD_CACHEDIR],["$LOOLWSD_CACHEDIR"],[Cache folder])
-AC_SUBST(LOOLWSD_CACHEDIR)
-
LOOLWSD_CONFIGDIR=${sysconfdir}/${PACKAGE}
AC_SUBST(LOOLWSD_CONFIGDIR)
diff --git a/ios/Mobile/Document.mm b/ios/Mobile/Document.mm
index af4ae0a75..70d130d64 100644
--- a/ios/Mobile/Document.mm
+++ b/ios/Mobile/Document.mm
@@ -49,12 +49,6 @@
- (BOOL)loadFromContents:(id)contents ofType:(NSString *)typeName
error:(NSError **)errorPtr {
- // If we are asked to empty the tile cache, do that now.
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"emptyTileCache"]) {
- [[NSFileManager defaultManager] removeItemAtPath:[NSString
stringWithUTF8String:LOOLWSD_CACHEDIR] error:nil];
- [[NSUserDefaults standardUserDefaults] setBool:NO
forKey:@"emptyTileCache"];
- }
-
fakeClientFd = fakeSocketSocket();
NSString *uri = [[self fileURL] absoluteString];
diff --git a/ios/Mobile/Resources/Settings.bundle/Root.plist
b/ios/Mobile/Resources/Settings.bundle/Root.plist
index 03f175818..f7e9d7653 100644
--- a/ios/Mobile/Resources/Settings.bundle/Root.plist
+++ b/ios/Mobile/Resources/Settings.bundle/Root.plist
@@ -28,16 +28,6 @@
</dict>
<dict>
<key>Type</key>
- <string>PSToggleSwitchSpecifier</string>
- <key>Title</key>
- <string>Empty tile cache next time</string>
- <key>Key</key>
- <string>emptyTileCache</string>
- <key>DefaultValue</key>
- <false/>
- </dict>
- <dict>
- <key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Template list URL</string>
diff --git a/ios/config.h.in b/ios/config.h.in
index c355439cd..59bc7a5f4 100644
--- a/ios/config.h.in
+++ b/ios/config.h.in
@@ -66,9 +66,6 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
-/* Cache folder */
-#define LOOLWSD_CACHEDIR lo_ios_app_getCacheDir()
-
/* LibreOffice Online WebSocket server version */
#define LOOLWSD_VERSION "@LOOLWSD_VERSION@"
diff --git a/ios/ios.mm b/ios/ios.mm
index 08ebb15cd..239540ac9 100644
--- a/ios/ios.mm
+++ b/ios/ios.mm
@@ -17,12 +17,4 @@ extern "C" {
int loolwsd_server_socket_fd = -1;
-const char* lo_ios_app_getCacheDir()
-{
- static NSString *cachePath =
[[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES)
objectAtIndex:0] stringByAppendingString:@"/tilecache"];
- static const char* result = strdup([cachePath UTF8String]);
-
- return result;
-}
-
// vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 296418a7c..5ffb55ab7 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -5,7 +5,6 @@
<allowed_languages desc="List of supported languages of Writing Aids
(spell checker, grammar checker, thesaurus, hyphenation) on this instance.
Allowing too many has negative effect on startup performance." default="de_DE
en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru">de_DE en_GB en_US es_ES fr_FR it
nl pt_BR pt_PT ru</allowed_languages>
- <tile_cache_path desc="Path to a directory where to keep the tile cache."
type="path" relative="false" default="@LOOLWSD_CACHEDIR@"></tile_cache_path>
<sys_template_path desc="Path to a template tree with shared libraries etc
to be used as source for chroot jails for child processes." type="path"
relative="true" default="systemplate"></sys_template_path>
<lo_template_path desc="Path to a LibreOffice installation tree to be
copied (linked) into the jails for child processes. Should be on the same file
system as systemplate." type="path" relative="false"
default="@LO_PATH@"></lo_template_path>
<child_root_path desc="Path to the directory under which the chroot jails
for the child processes will be created. Should be on the same file system as
systemplate and lotemplate. Must be an empty directory." type="path"
relative="true" default="jails"></child_root_path>
diff --git a/test/run_unit.sh.in b/test/run_unit.sh.in
index 1c63c3ae2..2b67e8385 100755
--- a/test/run_unit.sh.in
+++ b/test/run_unit.sh.in
@@ -11,7 +11,6 @@ abs_top_builddir="${DIR}/.."
systemplate_path="@SYSTEMPLATE_PATH@"
enable_debug="@ENABLE_DEBUG@"
jails_path="@JAILS_PATH@"
-tilecache_path="@TILECACHE_PATH@"
lo_path="@LO_PATH@"
valgrind_cmd="valgrind --tool=memcheck --trace-children=no -v
--read-var-info=yes"
verbose=''
@@ -89,7 +88,6 @@ if test "z$tst" == "z"; then
${abs_top_builddir}/loolwsd --o:sys_template_path="$systemplate_path" \
--o:lo_template_path="$lo_path" \
--o:child_root_path="$jails_path" \
- --o:tile_cache_path="$tilecache_path" \
--o:storage.filesystem[@allow]=true \
--o:logging.level=trace \
--o:logging.file[@enable]=false \
@@ -122,7 +120,6 @@ else # newer unit tests.
${abs_top_builddir}/loolwsd --o:sys_template_path="$systemplate_path" \
--o:lo_template_path="$lo_path" \
--o:child_root_path="$jails_path" \
- --o:tile_cache_path="$tilecache_path" \
--o:storage.filesystem[@allow]=true \
--o:logging.level=trace \
--o:ssl.key_file_path="${abs_top_builddir}/etc/key.pem" \
@@ -139,7 +136,6 @@ else # newer unit tests.
echo " $ gdb --args ${abs_top_builddir}/loolwsd
--o:sys_template_path=\"$systemplate_path\" \\"
echo " --o:lo_template_path=\"$lo_path\" \\"
echo " --o:child_root_path=\"$jails_path\" \\"
- echo " --o:tile_cache_path=\"$tilecache_path\" \\"
echo " --o:storage.filesystem[@allow]=true \\"
echo " --o:logging.level=trace \\"
echo "
--o:ssl.key_file_path=\"${abs_top_builddir}/etc/key.pem\" \\"
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 01a78b9b8..2239079e6 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -74,16 +74,6 @@ void sendLastModificationTime(const
std::shared_ptr<Session>& session,
documentBroker->broadcastMessage(message);
}
-/// Returns the cache path for a given document URI.
-std::string getCachePath(const std::string& uri)
-{
- Poco::SHA1Engine digestEngine;
-
- digestEngine.update(uri.c_str(), uri.size());
-
- return LOOLWSD::Cache + '/' +
- Poco::DigestEngine::digestToHex(digestEngine.digest()).insert(3,
"/").insert(2, "/").insert(1, "/");
-}
}
Poco::URI DocumentBroker::sanitizeURI(const std::string& uri)
@@ -167,7 +157,6 @@ DocumentBroker::DocumentBroker(const std::string& uri,
_docKey(docKey),
_docId(Util::encodeId(DocBrokerId++, 3)),
_childRoot(childRoot),
- _cacheRoot(getCachePath(uriPublic.toString())),
_documentChangedInStorage(false),
_lastSaveTime(std::chrono::steady_clock::now()),
_lastSaveRequestTime(std::chrono::steady_clock::now() -
std::chrono::milliseconds(COMMAND_TIMEOUT_MS)),
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 87d80bbdd..b5e4d65d9 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -409,7 +409,6 @@ private:
/// Short numerical ID. Unique during the lifetime of WSD.
const std::string _docId;
const std::string _childRoot;
- const std::string _cacheRoot;
std::shared_ptr<ChildProcess> _childProcess;
std::string _uriJailed;
std::string _uriJailedAnonym;
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index dc949e523..1381b98b2 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -208,9 +208,7 @@ static int careerSpanMs = 0;
#endif
bool LOOLWSD::NoCapsForKit = false;
-bool LOOLWSD::TileCachePersistent = true;
std::atomic<unsigned> LOOLWSD::NumConnections;
-std::string LOOLWSD::Cache = LOOLWSD_CACHEDIR;
std::set<std::string> LOOLWSD::EditFileExtensions;
#if MOBILEAPP
@@ -816,8 +814,6 @@ void LOOLWSD::initialize(Application& self)
{ "storage.wopi.max_file_size", "0" },
{ "storage.wopi[@allow]", "true" },
{ "sys_template_path", "systemplate" },
- { "tile_cache_path", LOOLWSD_CACHEDIR },
- { "tile_cache_persistent", "true" },
{ "trace.path[@compress]", "true" },
{ "trace.path[@snapshot]", "false" },
{ "trace[@enable]", "false" }
@@ -1004,7 +1000,6 @@ void LOOLWSD::initialize(Application& self)
#endif
- Cache = getPathFromConfig("tile_cache_path");
SysTemplate = getPathFromConfig("sys_template_path");
LoTemplate = getPathFromConfig("lo_template_path");
ChildRoot = getPathFromConfig("child_root_path");
@@ -1102,8 +1097,6 @@ void LOOLWSD::initialize(Application& self)
LOOLWSD::NumConnections = 0;
- TileCachePersistent = getConfigValue<bool>(conf, "tile_cache_persistent",
true);
-
// Command Tracing.
if (getConfigValue<bool>(conf, "trace[@enable]", false))
{
@@ -3107,15 +3100,6 @@ int LOOLWSD::innerMain()
setlocale(LC_ALL, "en_US.UTF-8");
#if !MOBILEAPP
- if (access(Cache.c_str(), R_OK | W_OK | X_OK) != 0)
- {
- const auto err = "Unable to access cache [" + Cache +
- "] please make sure it exists, and has write permission for
this user.";
- LOG_SFL( err );
- std::cerr << "FATAL: " << err << std::endl;
- return Application::EXIT_SOFTWARE;
- }
-
// We use the same option set for both parent and child loolwsd,
// so must check options required in the parent (but not in the
// child) separately now. Also check for options that are
@@ -3139,7 +3123,6 @@ int LOOLWSD::innerMain()
ChildRoot += '/';
FileUtil::registerFileSystemForDiskSpaceChecks(ChildRoot);
- FileUtil::registerFileSystemForDiskSpaceChecks(Cache + "/.");
if (FileServerRoot.empty())
FileServerRoot =
Poco::Path(Application::instance().commandPath()).parent().toString();
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 9303f789a..f4c2db405 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -53,7 +53,6 @@ public:
static std::atomic<int> ForKitProcId;
static bool DummyLOK;
static std::string FuzzFileName;
- static std::string Cache;
static std::string ConfigFile;
static std::string ConfigDir;
static std::string SysTemplate;
@@ -67,7 +66,6 @@ public:
static bool AnonymizeFilenames;
static bool AnonymizeUsernames;
static std::atomic<unsigned> NumConnections;
- static bool TileCachePersistent;
static std::unique_ptr<TraceFileWriter> TraceDumper;
static std::set<std::string> EditFileExtensions;
static unsigned MaxConnections;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
