typo: definied -> defined
This commit is contained in:
parent
6496a6125f
commit
b5d74eec16
9 changed files with 12 additions and 12 deletions
|
@ -262,7 +262,7 @@ class Connection(object):
|
||||||
self.handleHandshake(message)
|
self.handleHandshake(message)
|
||||||
else:
|
else:
|
||||||
self.server.handleRequest(self, message)
|
self.server.handleRequest(self, message)
|
||||||
else: # Old style response, no req_id definied
|
else: # Old style response, no req_id defined
|
||||||
if config.debug_socket:
|
if config.debug_socket:
|
||||||
self.log("Unknown message: %s, waiting: %s" % (message, self.waiting_requests.keys()))
|
self.log("Unknown message: %s, waiting: %s" % (message, self.waiting_requests.keys()))
|
||||||
if self.waiting_requests:
|
if self.waiting_requests:
|
||||||
|
|
|
@ -320,7 +320,7 @@ class ContentManager(object):
|
||||||
elif optional_pattern and re.match(optional_pattern, file_relative_path):
|
elif optional_pattern and re.match(optional_pattern, file_relative_path):
|
||||||
optional = True
|
optional = True
|
||||||
|
|
||||||
if ignored: # Ignore content.json, definied regexp and files starting with .
|
if ignored: # Ignore content.json, defined regexp and files starting with .
|
||||||
self.log.info("- [SKIPPED] %s" % file_relative_path)
|
self.log.info("- [SKIPPED] %s" % file_relative_path)
|
||||||
else:
|
else:
|
||||||
file_path = self.site.storage.getPath(dir_inner_path + "/" + file_relative_path)
|
file_path = self.site.storage.getPath(dir_inner_path + "/" + file_relative_path)
|
||||||
|
|
|
@ -81,7 +81,7 @@ def merge(merged_path):
|
||||||
if config.coffeescript_compiler is None:
|
if config.coffeescript_compiler is None:
|
||||||
config.coffeescript_compiler = findCoffeescriptCompiler()
|
config.coffeescript_compiler = findCoffeescriptCompiler()
|
||||||
if not config.coffeescript_compiler:
|
if not config.coffeescript_compiler:
|
||||||
logging.error("No coffeescript compiler definied, skipping compiling %s" % merged_path)
|
logging.error("No coffeescript compiler defined, skipping compiling %s" % merged_path)
|
||||||
return False # No coffeescript compiler, skip this file
|
return False # No coffeescript compiler, skip this file
|
||||||
|
|
||||||
# Replace / with os separators and escape it
|
# Replace / with os separators and escape it
|
||||||
|
|
|
@ -322,7 +322,7 @@ class FileRequest(object):
|
||||||
if self.server.tor_manager and self.server.tor_manager.site_onions.get(site.address): # Running onion
|
if self.server.tor_manager and self.server.tor_manager.site_onions.get(site.address): # Running onion
|
||||||
my_ip = helper.packOnionAddress(self.server.tor_manager.site_onions[site.address], self.server.port)
|
my_ip = helper.packOnionAddress(self.server.tor_manager.site_onions[site.address], self.server.port)
|
||||||
my_back = back_onion
|
my_back = back_onion
|
||||||
elif config.ip_external: # External ip definied
|
elif config.ip_external: # External ip defined
|
||||||
my_ip = helper.packAddress(config.ip_external, self.server.port)
|
my_ip = helper.packAddress(config.ip_external, self.server.port)
|
||||||
my_back = back_ip4
|
my_back = back_ip4
|
||||||
else: # No external ip defined
|
else: # No external ip defined
|
||||||
|
|
|
@ -18,7 +18,7 @@ class FileServer(ConnectionServer):
|
||||||
|
|
||||||
def __init__(self, ip=config.fileserver_ip, port=config.fileserver_port):
|
def __init__(self, ip=config.fileserver_ip, port=config.fileserver_port):
|
||||||
ConnectionServer.__init__(self, ip, port, self.handleRequest)
|
ConnectionServer.__init__(self, ip, port, self.handleRequest)
|
||||||
if config.ip_external: # Ip external definied in arguments
|
if config.ip_external: # Ip external defined in arguments
|
||||||
self.port_opened = True
|
self.port_opened = True
|
||||||
SiteManager.peer_blacklist.append((config.ip_external, self.port)) # Add myself to peer blacklist
|
SiteManager.peer_blacklist.append((config.ip_external, self.port)) # Add myself to peer blacklist
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -18,7 +18,7 @@ class TestUserContent:
|
||||||
# File info for exsitsing user file
|
# File info for exsitsing user file
|
||||||
valid_signers = site.content_manager.getValidSigners("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json")
|
valid_signers = site.content_manager.getValidSigners("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json")
|
||||||
assert '1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT' in valid_signers # The site address
|
assert '1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT' in valid_signers # The site address
|
||||||
assert '14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet' in valid_signers # Admin user definied in data/users/content.json
|
assert '14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet' in valid_signers # Admin user defined in data/users/content.json
|
||||||
assert '1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C' in valid_signers # The user itself
|
assert '1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C' in valid_signers # The user itself
|
||||||
assert len(valid_signers) == 3 # No more valid signers
|
assert len(valid_signers) == 3 # No more valid signers
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ class TestUserContent:
|
||||||
|
|
||||||
valid_signers = site.content_manager.getValidSigners("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_content)
|
valid_signers = site.content_manager.getValidSigners("data/users/1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C/content.json", user_content)
|
||||||
assert '1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT' in valid_signers # The site address
|
assert '1TeSTvb4w2PWE81S2rEELgmX2GCCExQGT' in valid_signers # The site address
|
||||||
assert '14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet' in valid_signers # Admin user definied in data/users/content.json
|
assert '14wgQ4VDDZNoRMFF4yCDuTrBSHmYhL3bet' in valid_signers # Admin user defined in data/users/content.json
|
||||||
assert not '1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C' in valid_signers # The user itself
|
assert not '1J6UrZMkarjVg5ax9W4qThir3BFUikbW6C' in valid_signers # The user itself
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ class Wrapper
|
||||||
else if cmd == "notification" # Display notification
|
else if cmd == "notification" # Display notification
|
||||||
type = message.params[0]
|
type = message.params[0]
|
||||||
id = "notification-#{message.id}"
|
id = "notification-#{message.id}"
|
||||||
if "-" in message.params[0] # - in first param: message id definied
|
if "-" in message.params[0] # - in first param: message id defined
|
||||||
[id, type] = message.params[0].split("-")
|
[id, type] = message.params[0].split("-")
|
||||||
@notifications.add(id, type, message.params[1], message.params[2])
|
@notifications.add(id, type, message.params[1], message.params[2])
|
||||||
else if cmd == "prompt" # Prompt input
|
else if cmd == "prompt" # Prompt input
|
||||||
|
|
|
@ -152,16 +152,16 @@ class WorkerManager:
|
||||||
if not self.tasks:
|
if not self.tasks:
|
||||||
return False # No task for workers
|
return False # No task for workers
|
||||||
if len(self.workers) >= self.getMaxWorkers() and not peers:
|
if len(self.workers) >= self.getMaxWorkers() and not peers:
|
||||||
return False # Workers number already maxed and no starting peers definied
|
return False # Workers number already maxed and no starting peers defined
|
||||||
if not peers:
|
if not peers:
|
||||||
peers = self.site.peers.values() # No peers definied, use any from site
|
peers = self.site.peers.values() # No peers defined, use any from site
|
||||||
if type(peers) is set:
|
if type(peers) is set:
|
||||||
peers = list(peers)
|
peers = list(peers)
|
||||||
|
|
||||||
random.shuffle(peers)
|
random.shuffle(peers)
|
||||||
for peer in peers: # One worker for every peer
|
for peer in peers: # One worker for every peer
|
||||||
if peers and peer not in peers:
|
if peers and peer not in peers:
|
||||||
continue # If peers definied and peer not valid
|
continue # If peers defined and peer not valid
|
||||||
worker = self.addWorker(peer)
|
worker = self.addWorker(peer)
|
||||||
if worker:
|
if worker:
|
||||||
self.log.debug("Added worker: %s, workers: %s/%s" % (peer.key, len(self.workers), self.getMaxWorkers()))
|
self.log.debug("Added worker: %s, workers: %s/%s" % (peer.key, len(self.workers), self.getMaxWorkers()))
|
||||||
|
|
|
@ -169,7 +169,7 @@ class Actions(object):
|
||||||
logging.info("Signing site: %s..." % address)
|
logging.info("Signing site: %s..." % address)
|
||||||
site = Site(address, allow_create=False)
|
site = Site(address, allow_create=False)
|
||||||
|
|
||||||
if not privatekey: # If no privatekey definied
|
if not privatekey: # If no privatekey defined
|
||||||
from User import UserManager
|
from User import UserManager
|
||||||
user = UserManager.user_manager.get()
|
user = UserManager.user_manager.get()
|
||||||
if user:
|
if user:
|
||||||
|
|
Loading…
Reference in a new issue