projects
/
osm
/
common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OSMENG-1095 VDU Terminate WF
[osm/common.git]
/
osm_common
/
fsmongo.py
diff --git
a/osm_common/fsmongo.py
b/osm_common/fsmongo.py
index
727410e
..
2e47039
100644
(file)
--- a/
osm_common/fsmongo.py
+++ b/
osm_common/fsmongo.py
@@
-235,7
+235,9
@@
class FsMongo(FsBase):
if e.errno != errno.ENOENT:
# This is probably permission denied or worse
raise
if e.errno != errno.ENOENT:
# This is probably permission denied or worse
raise
- os.symlink(link, file_path)
+ os.symlink(
+ link, os.path.realpath(os.path.normpath(os.path.abspath(file_path)))
+ )
else:
folder = os.path.dirname(file_path)
if folder not in valid_paths:
else:
folder = os.path.dirname(file_path)
if folder not in valid_paths:
@@
-570,9
+572,7
@@
class FsMongo(FsBase):
self.__update_local_fs(from_path=from_path)
def _update_mongo_fs(self, from_path):
self.__update_local_fs(from_path=from_path)
def _update_mongo_fs(self, from_path):
-
os_path = self.path + from_path
os_path = self.path + from_path
-
# Obtain list of files and dirs in filesystem
members = []
for root, dirs, files in os.walk(os_path):
# Obtain list of files and dirs in filesystem
members = []
for root, dirs, files in os.walk(os_path):
@@
-603,7
+603,9
@@
class FsMongo(FsBase):
# convert to relative path
rel_filename = os.path.relpath(member["filename"], self.path)
# convert to relative path
rel_filename = os.path.relpath(member["filename"], self.path)
- last_modified_date = datetime.datetime.fromtimestamp(
+ # get timestamp in UTC because mongo stores upload date in UTC:
+ # https://www.mongodb.com/docs/v4.0/tutorial/model-time-data/#overview
+ last_modified_date = datetime.datetime.utcfromtimestamp(
os.path.getmtime(member["filename"])
)
os.path.getmtime(member["filename"])
)
@@
-615,7
+617,6
@@
class FsMongo(FsBase):
remote_files.pop(rel_filename, None)
if last_modified_date >= upload_date:
remote_files.pop(rel_filename, None)
if last_modified_date >= upload_date:
-
stream = None
fh = None
try:
stream = None
fh = None
try:
@@
-646,13
+647,12
@@
class FsMongo(FsBase):
if stream:
stream.close()
if stream:
stream.close()
- # delete files that are not any
more in local fs
+ # delete files that are not anymore in local fs
for remote_file in remote_files.values():
for file in remote_file:
self.fs.delete(file._id)
def _get_mongo_files(self, from_path=None):
for remote_file in remote_files.values():
for file in remote_file:
self.fs.delete(file._id)
def _get_mongo_files(self, from_path=None):
-
file_dict = {}
file_cursor = self.fs.find(no_cursor_timeout=True, sort=[("uploadDate", -1)])
for file in file_cursor:
file_dict = {}
file_cursor = self.fs.find(no_cursor_timeout=True, sort=[("uploadDate", -1)])
for file in file_cursor: