diff options
| author | Aleksey Lim <alsroot@sugarlabs.org> | 2013-02-13 18:07:11 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2013-02-13 18:07:11 (GMT) |
| commit | e7591340d4cdc25ecb7657fb9b1b4c4d5bacf076 (patch) | |
| tree | 9d75636b824c9c3b684dfa39937b5d2d69cd20f6 | |
| parent | 35cd60ed71d5a23e5d209bb54ef3d5842472925c (diff) | |
Embed pylru dependency
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | sugar_network/lib/pylru | 0 | ||||
| -rw-r--r-- | sugar_network/node/stats.py | 5 | ||||
| -rw-r--r-- | sugar_network/node/sync_master.py | 6 | ||||
| l--------- | sugar_network/pylru.py | 1 | ||||
| -rw-r--r-- | sweets.recipe | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index e8dac90..a6b3152 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "sugar_network/lib/zeroinstall-injector"] path = sugar_network/lib/zeroinstall-injector url = git://git.sugarlabs.org/0sugar/zeroinstall-injector.git +[submodule "sugar_network/lib/pylru"] + path = sugar_network/lib/pylru + url = git://github.com/jlhutch/pylru.git diff --git a/sugar_network/lib/pylru b/sugar_network/lib/pylru new file mode 160000 +Subproject 2f9d1f8b33809a32aa510304b6c3da41461f2f4 diff --git a/sugar_network/node/stats.py b/sugar_network/node/stats.py index a77b4b7..7be6730 100644 --- a/sugar_network/node/stats.py +++ b/sugar_network/node/stats.py @@ -17,8 +17,7 @@ import os import logging from os.path import join, exists, isdir -from pylru import lrucache - +from sugar_network import pylru from sugar_network.toolkit.rrd import Rrd from sugar_network.toolkit import Option, util @@ -56,7 +55,7 @@ stats_user_rras = Option( _logger = logging.getLogger('node.stats') -_user_cache = lrucache(32) +_user_cache = pylru.lrucache(32) def get_rrd(user): diff --git a/sugar_network/node/sync_master.py b/sugar_network/node/sync_master.py index dee6041..7520d6d 100644 --- a/sugar_network/node/sync_master.py +++ b/sugar_network/node/sync_master.py @@ -21,9 +21,7 @@ import logging from Cookie import SimpleCookie from os.path import exists, join -from pylru import lrucache - -from sugar_network import db, node +from sugar_network import db, node, pylru from sugar_network.toolkit.sneakernet import InPacket, OutBufferPacket, \ OutPacket, DiskFull from sugar_network.toolkit.files_sync import Seeders @@ -45,7 +43,7 @@ class SyncCommands(object): def __init__(self): self._file_syncs = Seeders(node.sync_dirs.value, join(node.data_root.value, 'sync'), self.volume.seqno) - self._pull_queue = lrucache(_PULL_QUEUE_SIZE, + self._pull_queue = pylru.lrucache(_PULL_QUEUE_SIZE, lambda key, pull: pull.unlink()) @db.volume_command(method='POST', cmd='push') diff --git a/sugar_network/pylru.py b/sugar_network/pylru.py new file mode 120000 index 0000000..7fde624 --- /dev/null +++ b/sugar_network/pylru.py @@ -0,0 +1 @@ +lib/pylru/pylru.py
\ No newline at end of file diff --git a/sweets.recipe b/sweets.recipe index d74aa8c..02cabe7 100644 --- a/sweets.recipe +++ b/sweets.recipe @@ -11,7 +11,7 @@ homepage = http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network version = 0.7 stability = developer -requires = m2crypto; requests; rrdtool-python; openssh-client; pylru +requires = m2crypto; requests; rrdtool-python; openssh-client gevent >= 1; sugar-network-webui; sugar-network-hub replaces = sugar-network-server; sweets-recipe; active-document |