WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101 from deajan/fix_options 

Fix missing daemon subprocess options
This commit is contained in:
Orsiris de Jong 2017-05-30 10:18:57 +02:00 committed by GitHub
parent 908c9af888 a32314c720
commit d587e49e67
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,8 +1,15 @@
RECENT CHANGES RECENT CHANGES
-------------- --------------
dd Mmm YYYY: osync v1.2.2. release
! Added an option to log conflictual files
! Presence of conflictual files can trigger a special mail
! new option FORCE_CONFLICT_PREVALANCE
dd Mmm YYYY: osync v1.2.1 release dd Mmm YYYY: osync v1.2.1 release
- Fixed missing options passed to subprocess in daemon mode
- Fixed bogus pgrep can lead to segfault 11 because of recursive KillChilds - Fixed bogus pgrep can lead to segfault 11 because of recursive KillChilds
- Fixed osync deletion not working on systems with ssh banner enabled - Fixed osync deletion not working on systems with ssh banner enabled
- Added basic performance profiler to debug version - Added basic performance profiler to debug version

8
dev/n_osync.sh
View File

@ -4,9 +4,10 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2017 by Orsiris de Jong" AUTHOR="(C) 2013-2017 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=1.2.2-dev PROGRAM_VERSION=1.2.2-dev
PROGRAM_BUILD=2017053001 PROGRAM_BUILD=2017053002
IS_STABLE=no IS_STABLE=no
##### Execution order #__WITH_PARANOIA_DEBUG ##### Execution order #__WITH_PARANOIA_DEBUG
##### Function Name Is parallel #__WITH_PARANOIA_DEBUG ##### Function Name Is parallel #__WITH_PARANOIA_DEBUG
# GetLocalOS no #__WITH_PARANOIA_DEBUG # GetLocalOS no #__WITH_PARANOIA_DEBUG
@ -2249,9 +2250,11 @@ for i in "$@"; do
_NOLOCKS=true _NOLOCKS=true
;; ;;
--errors-only) --errors-only)
LOGGER_ERR_ONLY="yes" opts=$opts" --errors-only"
_LOGGER_ERR_ONLY=true
;; ;;
--summary) --summary)
opts=$opts" --summary"
_SUMMARY=true _SUMMARY=true
;; ;;
--log-conflicts) --log-conflicts)
@ -2259,6 +2262,7 @@ for i in "$@"; do
opts=$opts" --log-conflicts" opts=$opts" --log-conflicts"
;; ;;
--no-prefix) --no-prefix)
opts=$opts" --no-prefix"
_LOGGER_PREFIX="" _LOGGER_PREFIX=""
;; ;;
--destination-mails=*) --destination-mails=*)