[Libreoffice-commits] online.git: 3 commits - loolwsd/loolwsd.spec.in loolwsd/TileCache.cpp

[Mihai Varga]

 loolwsd/TileCache.cpp   |   13 -------------
 loolwsd/loolwsd.spec.in |    5 +++++
 2 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit eff724bda72cf3b99165381176acbf3282095ac7
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Mon Aug 3 22:01:11 2015 +0300

    loolwsd: fixed poorly placed cronjob

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index a4ccc28..8a6bbcc 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -49,15 +49,15 @@ env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
 %__install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
 install -d -m 755 %{buildroot}/var/adm/fillup-templates
 install -D -m 644 sysconfig.loolwsd %{buildroot}/var/adm/fillup-templates
+mkdir -p %{buildroot}/etc/cron.d
+echo "#Remove old tiles once every 10 days at midnight" > %{buildroot}/etc/cron.d/loolwsd.cron
+echo "0 0 */1 * * root find /var/cache/loolwsd -name \"*.png\" -a -atime +10 -exec rm {} \;" >> %{buildroot}/etc/cron.d/loolwsd.cron
 
 %files
 /usr/bin/loolwsd
 /usr/bin/loolwsd-systemplate-setup
 %{_unitdir}/loolwsd.service
 /var/adm/fillup-templates/sysconfig.loolwsd
-mkdir -p %{buildroot}/etc/cron.d
-echo "#Remove old tiles once every 10 days at midnight" > %{buildroot}/etc/cron.d/loolwsd.cron
-echo "0 0 */10 * * root find /var/cache/loolwsd -name \"*.png\" -a -atime +10 -exec rm {} \;" >> %{buildroot}/etc/cron.d/loolwsd.cron
 
 %doc README
 
@@ -95,6 +95,8 @@ su %{owner} -c "loolwsd-systemplate-setup ${loolparent}/lool/systemplate ${loroo
 %service_del_postun loolwsd.service
 
 %changelog
+* Mon Aug 03 2015 Mihai Varga
+- added the cronjob
 * Tue May 19 2015 Tor Lillqvist
 - Initial RPM release
 
commit b0282a2a037eeec4da2676d611c9e8870b308ce6
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Mon Aug 3 21:51:55 2015 +0300

    Revert "loolwsd: LRU expiry persistent cache"
    
    This reverts commit 74dcec1d3fe28fcb47f9424c505d97c04c6e973b.
    The cronjob replaces this

diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index 2203653..2ee9da7 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -31,9 +31,6 @@
 #include "LOOLProtocol.hpp"
 #include "TileCache.hpp"
 
-// 1 hour tile cache expired
-#define  TILE_EXPIRED 3600000000
-
 using Poco::DigestEngine;
 using Poco::DirectoryIterator;
 using Poco::File;
@@ -96,16 +93,6 @@ std::unique_ptr<std::fstream> TileCache::lookupTile(int part, int width, int hei
         return nullptr;
 
     std::string fileName = dirName + "/" + cachedName;
-    File fileTile(fileName);
-
-    if ( fileTile.exists() )
-    {
-        Poco::Timestamp timeNow;
-        if ( timeNow - fileTile.getLastModified() > TILE_EXPIRED )
-            fileTile.remove();
-        else
-            fileTile.setLastModified(timeNow);
-    }
 
     std::unique_ptr<std::fstream> result(new std::fstream(fileName, std::ios::in));
 
commit eceb9771867a5a9b35ddd2178246b3593f899290
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Mon Aug 3 21:48:19 2015 +0300

    loolwsd: cron job to delete old tiles from rpm packages
    
    place a cronjob file in /etc/cron.d/ which is removed when
    the loolwsd rpm packages is uninstalled

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 9c579d4..a4ccc28 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -55,6 +55,9 @@ install -D -m 644 sysconfig.loolwsd %{buildroot}/var/adm/fillup-templates
 /usr/bin/loolwsd-systemplate-setup
 %{_unitdir}/loolwsd.service
 /var/adm/fillup-templates/sysconfig.loolwsd
+mkdir -p %{buildroot}/etc/cron.d
+echo "#Remove old tiles once every 10 days at midnight" > %{buildroot}/etc/cron.d/loolwsd.cron
+echo "0 0 */10 * * root find /var/cache/loolwsd -name \"*.png\" -a -atime +10 -exec rm {} \;" >> %{buildroot}/etc/cron.d/loolwsd.cron
 
 %doc README