Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 4703/reports from aix nodes don t get parsed due to an erroneous date format #332

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion initial-promises/node-server/common/1.0/site.cf
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ bundle common g
"execRun" string => execresult("\"${g.rudder_sbin}\getDate.bat\"", "noshell");
android::
"execRun" string => execresult("/system/xbin/date \"+%Y-%m-%d %T%z\" | sed 's/\([-+][0-9][0-9]\)\([0-9][0-9]\)$/\1:\2/'", "useshell");
!linux.!cygwin.!windows.!android::
aix::
# AIX's date command doesn't have a "%z" option, so we fake it by using UTC
"execRun" string => execresult("/bin/date -u \"+%Y-%m-%d %T+00:00\"", "noshell");
!linux.!cygwin.!windows.!android.!aix::
"execRun" string => execresult("/bin/date \"+%Y-%m-%d %T%:z\"", "noshell");

}
5 changes: 4 additions & 1 deletion techniques/system/common/1.0/failsafe.st
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ bundle common g
&endif&
android::
"execRun" string => execresult("/system/xbin/date \"+%Y-%m-%d %T+02:00\"", "noshell");
!linux.!cygwin.!windows.!android::
aix::
# AIX's date command doesn't have a "%z" option, so we fake it by using UTC
"execRun" string => execresult("/bin/date -u \"+%Y-%m-%d %T+00:00\"", "noshell");
!linux.!cygwin.!windows.!android.!aix::
"execRun" string => execresult("/bin/date \"+%Y-%m-%d %T%:z\"", "noshell");

# definition of the node roles
Expand Down
5 changes: 4 additions & 1 deletion techniques/system/common/1.0/site.st
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ bundle common g
"execRun" string => execresult("\"${g.rudder_sbin}\getDate.bat\"", "noshell");
android::
"execRun" string => execresult("/system/xbin/date \"+%Y-%m-%d %T%z\" | sed 's/\([-+][0-9][0-9]\)\([0-9][0-9]\)$/\1:\2/'", "useshell");
!linux.!cygwin.!windows.!android::
aix::
# AIX's date command doesn't have a "%z" option, so we fake it by using UTC
"execRun" string => execresult("/bin/date -u \"+%Y-%m-%d %T+00:00\"", "noshell");
!linux.!cygwin.!windows.!android.!aix::
"execRun" string => execresult("/bin/date \"+%Y-%m-%d %T%:z\"", "noshell");

}