2
0
mirror of https://github.com/deajan/osync synced 2024-11-11 07:10:40 +00:00
Commit Graph

470 Commits

Author SHA1 Message Date
deajan
3d6eaef447 Bumped version to 1.3-dev 2018-06-30 19:40:24 +02:00
deajan
bf54ce8693 Finished WIP on --summary for deletions 2018-06-25 23:59:06 +02:00
deajan
7621f3ec25 Implemented --initialize 2018-06-25 23:55:13 +02:00
deajan
0ccc737631 Conflict log line only appears if used 2018-06-25 11:16:57 +02:00
deajan
1ed49b7d41 Quick note about file updates 2018-06-24 19:10:23 +02:00
deajan
6d37e161c8 Merge branch 'master' of https://github.com/deajan/osync 2018-03-22 17:24:36 +01:00
deajan
1b33068422 Fixed #135 2018-03-22 17:23:14 +01:00
Hugo Rivera
3c1c606de4 Set MAX_EXEC_TIME_PER_CMD_* variables without config file 2018-03-20 03:58:21 -06:00
Hugo Rivera
4725370d8e Set MIN_WAIT without config file 2018-03-20 03:58:10 -06:00
deajan
46a990c4d8 Fixed inotifywait cannot load loop 2018-02-20 22:53:30 +01:00
deajan
d8b30d7711 Added sed regex compat for MacOS 2018-02-20 22:39:42 +01:00
deajan
034c1693e9 Updated ExecTasks version 2018-02-20 22:15:04 +01:00
deajan
9b8fe3774e Fixed time counting for new ExecTasks 2018-01-02 20:05:54 +01:00
deajan
73d592ad34 Merged WaitForTaskCompletion and ParallelExec into ExecTasks 2018-01-02 20:02:57 +01:00
deajan
0a1dc91fad Fixed bogus global WAIT_FOR variable 2017-11-23 16:58:29 +01:00
deajan
6d217c1e15 Reintroduced fix from #120 2017-11-22 15:05:09 +01:00
deajan
71a0437de6 Ensured writeLocks=false at beginning of lock handling 2017-11-22 15:02:17 +01:00
deajan
86930737b0 Added -f to local replica unlock 2017-08-14 22:21:41 +02:00
deajan
09c664fe4b Moved commandline args setup to sub function 2017-07-27 22:50:48 +02:00
deajan
8d9a6be16a Typo fixing 2017-06-18 22:11:09 +02:00
deajan
1dc9408044 Fix double compression extension 2017-06-09 09:56:11 +02:00
deajan
9676ccccad Removed work comments 2017-06-09 08:34:48 +02:00
deajan
45e4419a0f Fixed typo 2017-06-09 08:33:57 +02:00
deajan
9b9631fe2c Changed sed -E to sed -r for compat issues 2017-06-08 16:30:20 +02:00
deajan
5c36e803d8 Revert "More sort enforcing"
This reverts commit fbb36b51b7.
2017-06-08 15:39:57 +02:00
deajan
fbb36b51b7 More sort enforcing 2017-06-08 15:20:36 +02:00
deajan
4678ab7e71 Fixed missing env for LC_ALL 2017-06-08 09:25:33 +02:00
deajan
261521d047 Added LC_ALL to all ssh calls 2017-06-07 12:48:52 +02:00
deajan
30c6b3ec46 timestampList is not used for ACL lists yet 2017-06-07 12:17:39 +02:00
deajan
543cfc1159 Fixing sort order in conflictList 2017-06-06 17:39:53 +02:00
deajan
679e140084 Fix new regex in treelist for rsync output 2017-06-06 16:47:32 +02:00
deajan
d0d7be40c3 Added --dry support for conflict list 2017-06-05 18:59:05 +02:00
deajan
7a24cf49cd Implemented --alert-conflicts options 2017-06-05 18:53:15 +02:00
deajan
be3b3d39b6 Added error handling to conflict list functions 2017-06-05 15:32:38 +02:00
deajan
7260d43416 Improved conflict list work 2017-06-04 19:07:22 +02:00
deajan
1d7cb5be53 Multiple file list fixes 2017-06-04 13:01:34 +02:00
deajan
2b786abc6a Some comment removal 2017-06-03 13:57:10 +02:00
deajan
967ce33977 WIP: conflict list 2017-06-03 13:51:49 +02:00
deajan
37ca73a6f9 moved unfortunate comment placement 2017-06-03 01:28:34 +02:00
deajan
9e1c3c2a65 WIP: conflict list 2017-06-03 01:20:38 +02:00
deajan
862a6fd235 Fixed some more typo 2017-06-02 15:42:45 +02:00
deajan
83fd33bf78 WIP: conflict list 2017-06-01 17:45:02 +02:00
deajan
99b606fef8 WIP: conflict list 2017-05-31 18:02:18 +02:00
deajan
b0307fd555 Another typo fix 2017-05-31 12:36:39 +02:00
deajan
eb73d49c69 Typo fixing 2017-05-31 12:31:18 +02:00
deajan
d91230e22f WIP: conflict list 2017-05-31 11:16:36 +02:00
deajan
825e051e3b WIP: conflict list 2017-05-30 15:45:43 +02:00
deajan
a7ceea1dac WIP: conflict list 2017-05-30 15:00:05 +02:00
Orsiris de Jong
6a4b3701d0 Merge branch 'master' into no-resume 2017-05-30 14:50:21 +02:00
deajan
45cb042fa0 Added --no-resume option 2017-05-30 14:46:35 +02:00
deajan
5c60e7a9a2 WIP: conflict detection 2017-05-30 14:36:04 +02:00
deajan
a99a96e871 WIP: conflict detection 2017-05-30 14:35:44 +02:00
deajan
f98a9a0748 WIP: getting conflict list of files 2017-05-30 12:16:59 +02:00
deajan
b541a7c98e WIP: detect conflict files 2017-05-30 11:14:11 +02:00
Orsiris de Jong
a32314c720 Merge branch 'master' into fix_options 2017-05-30 10:18:48 +02:00
deajan
520c20659f Added missing options to subprocess in daemon mode 2017-05-30 10:12:28 +02:00
deajan
908c9af888 Added --log-conflicts option 2017-05-30 09:29:16 +02:00
deajan
0b442e2bcf Updated work comments 2017-05-30 09:19:47 +02:00
deajan
a32b5f8321 Bumped version to next dev 2017-05-30 09:15:48 +02:00
deajan
2c1e688d8e Bumped dev versions to rc 2017-05-30 09:11:00 +02:00
deajan
78dc39b86f Change 23242 to 2017-05-30 09:09:25 +02:00
deajan
5677335c24 Removed WIP dev sleep command in treeList 2017-05-22 11:19:03 +02:00
deajan
762fd236a0 Bumped version to dev again 2017-05-22 09:32:34 +02:00
deajan
19c15d2265 Bumped version to v1.2 final 2017-03-23 23:02:43 +01:00
deajan
1404b81d56 Added initiator dir check before running monitor mode 2017-03-21 22:56:03 +01:00
deajan
baaf1a621a Bumped version to v1.2RC3 2017-02-10 11:53:01 +01:00
deajan
685d1d0bf1 Don't show failed commands in stdout, only log them 2017-02-10 11:15:41 +01:00
deajan
8c40e0c950 Removed unnecessary spaces 2017-02-10 10:35:17 +01:00
deajan
d539892188 Bumped to stable state 2017-02-08 16:27:01 +01:00
deajan
98d3cc99b8 Simplified ssh_filter 2017-02-08 15:28:41 +01:00
deajan
4135c59869 Added _REMOTE_TOKEN for ssh_filter 2017-02-08 13:52:04 +01:00
deajan
77e4a05613 Bumped version to v1.2RC2 2017-02-08 08:39:26 +01:00
deajan
18a4dc4fe9 Missing sudo is critical 2017-02-07 22:19:05 +01:00
deajan
0aaf988c48 check for sudo when needed 2017-02-07 22:13:52 +01:00
deajan
1b354012b8 Added rsyncCmd debug info 2017-02-06 17:15:07 +01:00
deajan
e24becdea1 Added debug command info 2017-02-06 17:11:39 +01:00
deajan
69f8945806 Fix for escaped UTF-8 characters in log files 2017-02-03 14:09:14 +01:00
deajan
7e4400ba7a Fixed typo 2017-02-03 11:15:59 +01:00
deajan
d1e5a50c0d Update files 2017-02-03 09:52:24 +01:00
deajan
97a1aa5e05 Updated sudo behavior 2016-12-19 13:19:21 +01:00
deajan
bd0450d95e Fixed wrong __CheckArguments call 2016-12-15 12:01:10 +01:00
deajan
091f9ed1be Avoid possible log interference between parallel functions 2016-12-15 11:24:45 +01:00
deajan
03a83b598d Logging tweaks. Also fixed remote find cmd used instead of local one 2016-12-15 10:12:36 +01:00
deajan
622b607bac Revised log levels of command output for --errors-only 2016-12-14 08:12:35 +01:00
deajan
114ea896d6 Bumped version to RC1+dev 2016-12-13 20:55:15 +01:00
deajan
7039a8a16c Bumped version to v1.2-RC1 2016-12-13 20:41:25 +01:00
deajan
bd800dc5e9 Critical fix for random errors when CheckConnectivity fails in sub function of Sync 2016-12-13 12:28:06 +01:00
deajan
11b494069a Resuming previous operation should not be a warning message 2016-12-13 11:45:51 +01:00
deajan
c7ad48bb80 Fixing directory soft deletion 2016-12-12 23:33:57 +01:00
deajan
98502dd1a6 Fix Fix rsync 3.0.6 C6 obscure --skip-compress verbosity 2016-12-12 22:41:01 +01:00
deajan
6a3499ca88 Fix obscure rsync 3.0.6 skip-compress too verbose bug 2016-12-12 21:46:44 +01:00
deajan
be18397865 Reworked comment 2016-12-12 19:30:09 +01:00
deajan
ae8ef5ff13 Uncommented CleanUp as debugging is done 2016-12-12 19:23:58 +01:00
deajan
486f63043d Fixed stupid typos 2016-12-12 11:38:27 +01:00
deajan
a3af29804d Fixed missing env variables for remote calls 2016-12-12 11:16:53 +01:00
deajan
4d52f71061 Added some degree of randomisation on RUN_DIR files 2016-12-12 10:14:59 +01:00
deajan
ded6203ae3 Removed unnecessary comments 2016-12-11 22:54:56 +01:00
deajan
23cac5cad6 Unexpanded all source files 2016-12-11 20:54:40 +01:00
deajan
882cd7099e Bootstrap test 2016-12-11 14:57:02 +01:00
deajan
8bce416b62 Fixed typo 2016-12-11 14:52:09 +01:00
deajan
e834059721 Multiple error detection fixes 2016-12-11 14:45:01 +01:00
deajan
f607cd9ab2 Quick _SoftDeleteLocal refactor 2016-12-11 14:36:26 +01:00
deajan
cdde314029 Code compliance 2016-12-11 14:26:48 +01:00
deajan
a7393818d4 Debug code to resolve random thrown error alert 2016-12-10 10:57:25 +01:00
deajan
d15069a85b More FreeBSD acl fix 2016-12-09 19:01:58 +01:00
deajan
a08ce8904b Reverted bogus var name change 2016-12-09 17:10:04 +01:00
deajan
be0d0ab8d9 Fixed daemon exclusions 2016-12-09 11:04:56 +01:00
deajan
435b597513 Workaround for FreeBSD inotifywait only wants one exclude 2016-12-08 22:10:54 +01:00
deajan
61adfc6c6f Workaround for FreeBSD 11 get ctime default shell 2016-12-08 21:59:52 +01:00
deajan
97eee22944 Added env for csh... Fuck you csh ! 2016-12-08 11:36:55 +01:00
deajan
15c49f3aa4 Removed typo 2016-12-08 11:04:51 +01:00
deajan
d6b5fcc20f Added pgrep test 2016-12-08 10:59:07 +01:00
deajan
c8e2c4e438 Fixed typo 2016-12-08 08:56:13 +01:00
deajan
731fc81abf Made ofunctions "includable" 2016-12-07 21:30:10 +01:00
deajan
f14903cce5 Remote functions should not log to files 2016-12-07 09:06:28 +01:00
deajan
9735a83b35 Reverted test disable HandleLocks 2016-12-06 22:51:19 +01:00
root
ae16cefe54 Refactored CheckDiskSpace & CheckReplicaPath into CheckReplicas 2016-12-06 22:41:44 +01:00
root
59b8764da6 Merged CreateStateDirs, CheckLocks and WriteLocks into HandleLocks 2016-12-06 21:32:27 +01:00
root
54cf89cb27 Force bash as remote shell. Also refactor remote soft deletion and fix directory ctime find 2016-12-06 13:30:05 +01:00
deajan
9246c2aa6e Simplified test suite 2016-12-06 09:23:43 +01:00
deajan
2d4b8cf572 Fixed typo 2016-12-05 23:28:43 +01:00
deajan
ed1a4c152a Removed unnecessary comments 2016-12-04 11:15:27 +01:00
deajan
3dcdeb20b1 Removed unnecessary code 2016-12-04 11:12:55 +01:00
deajan
078d47403f Reorganized function chronology 2016-12-04 11:10:02 +01:00
deajan
3a414da41d Program finish should always be logged 2016-12-04 10:58:53 +01:00
deajan
a87c44b9dc Rendered WaitForTaskCompletion global output thread safe 2016-12-03 10:40:30 +01:00
deajan
3d8f20d2ed Removed more unnecessary comments 2016-12-03 09:59:59 +01:00
deajan
52e7921b53 Quick semantic update for soft stop 2016-12-03 09:53:44 +01:00
deajan
edc358f2ff Finish work on symlink detection in treeList 2016-12-01 21:14:07 +01:00
deajan
651bf48990 Added symlink support in deletion propagation 2016-12-01 20:51:45 +01:00
deajan
33f985b751 WIP: getting treeList to work with or without symlinks 2016-12-01 20:20:55 +01:00
deajan
2cb5084d8b WIP on treeList in order to list but bypass bad symlinks 2016-12-01 19:24:01 +01:00
deajan
175df3d81e More explicit error message in treeList 2016-12-01 09:51:06 +01:00
deajan
be852ca7df Better time control in sync function 2016-11-29 22:40:43 +01:00
deajan
745688d982 Improved timed execution of sync function 2016-11-29 20:28:00 +01:00
deajan
8500bfa5d9 Work on WaitForTaskCompletion ongoing 2016-11-25 22:15:03 +01:00
deajan
0baed43267 Updated osync with new WaitForTaskCompletion syntax 2016-11-24 09:40:55 +01:00
deajan
f45911a548 Fixed summary does reset logger prefix 2016-11-22 19:08:05 +01:00
deajan
da302b0f3a inotifywait timeout emulation only needed on mac 2016-11-22 17:18:35 +01:00
deajan
85466e0ab0 Added MAX_WAIT support for MacOS daemon mode 2016-11-21 19:18:22 +01:00
deajan
d55ecf7781 Added QaD daemon mode for Mac 2016-11-21 17:02:05 +01:00
deajan
2b8fe18217 Disable ACL and XATTR preserve by default on Mac 2016-11-21 15:13:15 +01:00
deajan
6987a7f0f3 Better check if remote deletion file is present 2016-11-21 13:21:26 +01:00
deajan
5d7e54c743 Remote deletion log is always ERROR level 2016-11-21 11:34:54 +01:00
deajan
ec95b8683c Added missing log from remote deletion 2016-11-21 10:55:35 +01:00
deajan
8190bef067 Fix for failed deletion repropagation in BSD 2016-11-20 19:25:19 +01:00
deajan
56dabb97c1 Fixed bypassing some taks for android 2016-11-19 12:54:24 +01:00
deajan
cc16c29c2c Disable PRESERVE ACL & ATTR by default for compat reasons 2016-11-19 12:49:19 +01:00
deajan
630f26f8d2 Corrected variable # of arguments for _WriteLockFiles 2016-11-19 12:47:17 +01:00
deajan
8ba36de138 Fixing issues between android and centos 5 2016-11-19 12:37:26 +01:00
deajan
d89980e1bd Fixed _CheckDiskSpaceRemote compat on CentOS 5 2016-11-18 12:53:07 +01:00
deajan
f6682dabf6 Fixed CheckDiskSpace compat on CentOS 5 2016-11-18 12:49:48 +01:00
deajan
28a9c908d5 Moved cleanup function according to new ofunctions 2016-11-17 21:04:42 +01:00
deajan
5e1452a92f Minor logger changes 2016-11-17 20:01:12 +01:00
deajan
853f2692dd Some work on Logger function 2016-11-17 20:00:23 +01:00
deajan
0dd472f2c2 Some semantic updates for locking functions 2016-11-17 13:29:34 +01:00
deajan
c4302a46ef Fixed locking checks 2016-11-17 12:13:56 +01:00
deajan
ae20963871 Fixed skip deletions from config file not handled properly 2016-11-16 15:47:42 +01:00
deajan
8884d77be0 Added default separator char in quicksync mode 2016-11-15 22:32:33 +01:00
deajan
317791da5a Fixed failed delete rerun & fixed logger flags in subprocesses 2016-11-15 21:27:32 +01:00
deajan
02e26538c7 Added ACL/Xattr default values for quicksync 2016-11-15 19:25:22 +01:00
deajan
caad06379d Fixed wrong number of arguments for _SummaryFromFile checks 2016-11-15 19:21:24 +01:00
deajan
fe0492d052 Fixed backups gone to the wrong directory 2016-11-15 13:49:00 +01:00
deajan
b68162fd8e More accurate syncattr skip check 2016-11-15 13:25:35 +01:00
deajan
229abbf9c1 Removed unnecessary local variables 2016-11-15 13:12:30 +01:00
deajan
e4d940c5c8 Cosmetic change 2016-11-15 13:11:59 +01:00
deajan
ce7c712329 Finished work on summary function 2016-11-15 13:10:47 +01:00
deajan
e4188b0f4c Minor fixes 2016-11-14 22:17:02 +01:00
deajan
111d3569a7 WIP on summary 2016-11-14 21:14:10 +01:00
deajan
63c64c5d5e Added --summary and --no-prefix arguments 2016-11-14 19:17:30 +01:00
deajan
8ccad34d01 Fixed option name 2016-11-14 17:20:26 +01:00
deajan
10f5fa9c0f Added --errors-only switch 2016-11-14 17:11:50 +01:00
deajan
f4a59e8897 Fixed typo preventing remote ACL sync 2016-11-13 20:12:09 +01:00
deajan
4869e3e89a Fixed checking remote pings regarless of mode 2016-11-13 15:59:12 +01:00
deajan
6f7a87b2de Fixed bogus value shown with preflight checks 2016-11-13 15:53:16 +01:00
deajan
afff4eff67 Updated changelog and readme.md 2016-11-13 14:46:59 +01:00
deajan
6321951bd2 Fixed typo 2016-11-10 16:23:43 +01:00
deajan
a640726d94 More logging fixes 2016-11-10 16:15:29 +01:00
deajan
06d2171a31 Code compliance 2016-10-23 13:28:28 +02:00
deajan
80a5bb0102 More portable grep -E treeList 2016-10-23 11:04:24 +02:00
deajan
6fa212bbca Added dirty workaround for human readable df output in busybox 2016-10-23 10:35:55 +02:00
deajan
a450cf39d0 busybox working now 2016-10-23 09:46:20 +02:00
deajan
101cb26549 Cosmetic fixes 2016-10-22 20:59:50 +02:00
deajan
620484a6d8 More busybox love again 2016-10-22 20:56:14 +02:00
deajan
d71540d609 More busybox love 2016-10-22 20:47:10 +02:00
deajan
ff16854b88 Fixed introduced bug with IsNumericExpand 2016-10-21 21:46:59 +02:00
deajan
67be5560af Removed SC2002 warning 2016-10-21 18:25:53 +02:00
deajan
beea979440 Another check for log writing 2016-10-21 18:23:45 +02:00
deajan
1366b0c10c Prefered C style boolean values 2016-10-21 15:29:49 +02:00
deajan
9c212c1bd1 Added SKIP_DELETION support 2016-10-21 12:38:03 +02:00
deajan
d68e4d1e1b Prevent locking race conditions 2016-10-19 13:30:08 +02:00
deajan
5e52e395ef Added ssh password test 2016-10-19 12:44:52 +02:00
deajan
408eb170c4 Added ssh password file support 2016-10-19 12:28:11 +02:00
deajan
a57d4ab98a Fixed deletion detection when bad symlinks present 2016-10-17 09:56:40 +02:00
deajan
c2959fb98b Removed SC2086 from __CheckArguments call 2016-10-16 22:08:16 +02:00
deajan
b63e4da847 Fixed deletion propagation after last code simplification 2016-10-16 22:00:31 +02:00
deajan
a37bb85e65 Simplified function calls due to code compliance 2016-10-16 14:25:29 +02:00
deajan
e77d3be37f Simplified deleted_list function 2016-10-16 12:33:53 +02:00
deajan
130b0ed113 Added symlink delete and broken symlink detection support 2016-10-16 12:12:59 +02:00
deajan
7505832914 Fixed semantic 2016-09-16 17:18:48 +02:00