Skip to content

Get last_policy_update var from stat #13

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.

Sign up for GitHub

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

Merged
sigurdteigen merged 4 commits into from
Mar 6, 2012
Merged

Get last_policy_update var from stat #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6b82c9
use thread-safe and OS-agnostic function instead of ctime (Windows an…
estenberg Feb 28, 2012
d96704a
use stat of cf_promises_validated instead of contents: stat comes fro…
estenberg Feb 28, 2012
045d93a
cf_promises_validated: use digest copy instead of mtime to make it ro…
estenberg Feb 28, 2012
935acc8
fix indent
estenberg Feb 28, 2012
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
15 changes: 1 addition & 14 deletions masterfiles/failsafe.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ bundle agent update
"$(inputs_dir)/cf_promises_validated"
comment => "Check whether a validation stamp is available for a new policy update to reduce the distributed load",
handle => "check_valid_update",
copy_from => u_dcp("$(master_location)/cf_promises_validated","$(sys.policy_hub)"),
copy_from => u_rcp("$(master_location)/cf_promises_validated","$(sys.policy_hub)"),
action => u_immediate,
classes => u_if_repaired("validated_updates_ready");

Expand Down Expand Up @@ -200,19 +200,6 @@ body copy_from u_rcp(from,server)

#########################################################

body copy_from u_dcp(from,server)
{
source => "$(from)";
compare => "mtime";
trustkey => "true";

!am_policy_hub::

servers => { "$(server)" };
}

#########################################################

body copy_from u_cp_nobck(from)
{
source => "$(from)";
Expand Down
13 changes: 8 additions & 5 deletions src/bootstrap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,14 +233,17 @@ void SetPolicyServer(char *name)
snprintf(file, CF_MAXVARSIZE, "%s/masterfiles/cf_promises_validated", CFWORKDIR);
MapName(file);

if ((fin = fopen(file, "r")) == NULL)
struct stat sb;

if ((cfstat(file, &sb)) != 0)
{
return;
}

fscanf(fin, "%255[^\n]", fileContents);
NewScalar("sys", "last_policy_update", fileContents, cf_str);
fclose(fin);

char timebuf[26];
cf_strtimestamp_local(sb.st_mtime, timebuf);

NewScalar("sys", "last_policy_update", timebuf, cf_str);
}

/********************************************************************/
Expand Down
4 changes: 3 additions & 1 deletion src/generic_agent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,9 @@ int CheckPromises(enum cfagenttype ag)
FILE *fp = fdopen(fd, "w");
time_t now = time(NULL);

fprintf(fp, "%s", ctime(&now));
char timebuf[26];

fprintf(fp, "%s", cf_strtimestamp_local(now, timebuf));
fclose(fp);
CfOut(cf_verbose, "", " -> Caching the state of validation\n");
}
Expand Down