You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by el...@apache.org on 2017/04/10 18:43:31 UTC
[1/6] incubator-trafficcontrol git commit: Delete launch.json
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master c03453d8c -> 140bf4d49
Delete launch.json
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b36d6a86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b36d6a86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b36d6a86
Branch: refs/heads/master
Commit: b36d6a86ced3a01a1ebc1850cc7aeb928e5ff64a
Parents: 24fe056
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Sat Apr 1 12:37:19 2017 -0400
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Mon Apr 10 12:42:46 2017 -0600
----------------------------------------------------------------------
traffic_ops/.vscode/launch.json | 21 ---------------------
1 file changed, 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b36d6a86/traffic_ops/.vscode/launch.json
----------------------------------------------------------------------
diff --git a/traffic_ops/.vscode/launch.json b/traffic_ops/.vscode/launch.json
deleted file mode 100644
index 22ce6df..0000000
--- a/traffic_ops/.vscode/launch.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- // Use IntelliSense to learn about possible Node.js debug attributes.
- // Hover to view descriptions of existing attributes.
- // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
- "version": "0.2.0",
- "configurations": [
- {
- "type": "node",
- "request": "launch",
- "name": "Launch Program",
- "program": "${workspaceRoot}/app.js",
- "cwd": "${workspaceRoot}"
- },
- {
- "type": "node",
- "request": "attach",
- "name": "Attach to Process",
- "port": 5858
- }
- ]
-}
\ No newline at end of file
[5/6] incubator-trafficcontrol git commit: fix error log wrapping
Posted by el...@apache.org.
fix error log wrapping
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/63c1c783
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/63c1c783
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/63c1c783
Branch: refs/heads/master
Commit: 63c1c783935eb9df688f979cc34338c8f1702b22
Parents: 9675689
Author: Derek Gelinas <mr...@gmail.com>
Authored: Fri Mar 31 18:59:19 2017 +0000
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Mon Apr 10 12:42:46 2017 -0600
----------------------------------------------------------------------
traffic_ops/bin/traffic_ops_ort.pl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/63c1c783/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index a8be0ca..1b1a9cf 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -1735,9 +1735,8 @@ sub get_cfg_file_list {
}
}
else {
- printf( "INFO Reval in use status: $reval_in_use \n" );
if ( $reval_in_use == 1 ) {
- printf( "INFO Instant Invalidate is in use. Skipping regex_revalidate.config. \n" );
+ ( $log_level >> $WARN ) && printf("WARN Instant Invalidate is enabled. Skipping regex_revalidate.config.\n");
delete $ort_ref->{'config_files'}->{'regex_revalidate.config'};
}
foreach my $cfg_file ( keys %{ $ort_ref->{'config_files'} } ) {
[4/6] incubator-trafficcontrol git commit: show UI route revert
message for error level logging
Posted by el...@apache.org.
show UI route revert message for error level logging
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/96756894
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/96756894
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/96756894
Branch: refs/heads/master
Commit: 96756894d5ab0d8841b30f36f02b5e5f5a035cd1
Parents: 0610280
Author: Derek Gelinas <mr...@gmail.com>
Authored: Fri Mar 31 18:55:21 2017 +0000
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Mon Apr 10 12:42:46 2017 -0600
----------------------------------------------------------------------
traffic_ops/.vscode/launch.json | 21 +++++++++++++++++++++
traffic_ops/bin/traffic_ops_ort.pl | 2 +-
2 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96756894/traffic_ops/.vscode/launch.json
----------------------------------------------------------------------
diff --git a/traffic_ops/.vscode/launch.json b/traffic_ops/.vscode/launch.json
new file mode 100644
index 0000000..22ce6df
--- /dev/null
+++ b/traffic_ops/.vscode/launch.json
@@ -0,0 +1,21 @@
+{
+ // Use IntelliSense to learn about possible Node.js debug attributes.
+ // Hover to view descriptions of existing attributes.
+ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "type": "node",
+ "request": "launch",
+ "name": "Launch Program",
+ "program": "${workspaceRoot}/app.js",
+ "cwd": "${workspaceRoot}"
+ },
+ {
+ "type": "node",
+ "request": "attach",
+ "name": "Attach to Process",
+ "port": 5858
+ }
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96756894/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index 61fb84c..a8be0ca 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -1690,7 +1690,7 @@ sub get_cfg_file_list {
if ($result eq '404') {
$api_in_use = 0;
- ( $log_level >> $INFO ) && printf("INFO Traffic Ops version does not support config files API. Reverting to UI route.\n");
+ ( $log_level >> $ERROR ) && printf("ERROR Traffic Ops version does not support config files API. Reverting to UI route.\n");
$uri = "/ort/$host_name/ort1";
$result = &lwp_get($uri);
}
[6/6] incubator-trafficcontrol git commit: This closes #416.
Posted by el...@apache.org.
This closes #416.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/140bf4d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/140bf4d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/140bf4d4
Branch: refs/heads/master
Commit: 140bf4d49af76298471b5be7cc1378f65d60b5f9
Parents: b36d6a8
Author: Jeff Elsloo <je...@cable.comcast.com>
Authored: Mon Apr 10 12:43:09 2017 -0600
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Mon Apr 10 12:43:09 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] incubator-trafficcontrol git commit: skip regex_revalidate,
parent check if instant invalidate enabled
Posted by el...@apache.org.
skip regex_revalidate, parent check if instant invalidate enabled
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/0610280a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/0610280a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/0610280a
Branch: refs/heads/master
Commit: 0610280aeeee413905d3199391e4a801b951385d
Parents: c03453d
Author: Derek Gelinas <mr...@gmail.com>
Authored: Fri Mar 31 17:50:25 2017 +0000
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Mon Apr 10 12:42:46 2017 -0600
----------------------------------------------------------------------
traffic_ops/bin/traffic_ops_ort.pl | 92 +++++++++++----------------------
1 file changed, 31 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0610280a/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index ec19d57..61fb84c 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -886,70 +886,35 @@ sub check_syncds_state {
exit 1;
}
}
- if ( defined($parent_reval_pending) ) {
- if ( ( $parent_pending == 1 || $parent_reval_pending == 1 ) && $wait_for_parents == 1 ) {
- ( $log_level >> $ERROR ) && print "ERROR Traffic Ops is signaling that my parents need an update.\n";
- if ( $script_mode == $SYNCDS ) {
- if ( $dispersion > 0 ) {
- ( $log_level >> $WARN ) && print "WARN In syncds mode, sleeping for " . $dispersion . "s to see if the update my parents need is cleared.\n";
- ( $dispersion > 0 ) && &sleep_timer($dispersion);
- }
-
- $upd_ref = &lwp_get($uri);
- if ( $upd_ref =~ m/^\d{3}$/ ) {
- ( $log_level >> $ERROR ) && print "ERROR Update URL: $uri returned $upd_ref. Exiting, not sure what else to do.\n";
- exit 1;
- }
- $upd_json = decode_json($upd_ref);
- $parent_pending = ( defined( $upd_json->[0]->{'parent_pending'} ) ) ? $upd_json->[0]->{'parent_pending'} : undef;
- if ( !defined($parent_pending) ) {
- ( $log_level >> $ERROR ) && print "ERROR Invalid JSON for $uri. Exiting, not sure what else to do.\n";
- }
- if ( $parent_pending == 1 || $parent_reval_pending == 1 ) {
- ( $log_level >> $ERROR ) && print "ERROR My parents still need an update, bailing.\n";
- exit 1;
-
- }
- else {
- ( $log_level >> $DEBUG ) && print "DEBUG The update on my parents cleared; continuing.\n";
- }
+ if ( $parent_pending == 1 && $wait_for_parents == 1 && $reval_in_use == 0) {
+ ( $log_level >> $ERROR ) && print "ERROR Traffic Ops is signaling that my parents need an update.\n";
+ if ( $script_mode == $SYNCDS ) {
+ if ( $dispersion > 0 ) {
+ ( $log_level >> $WARN ) && print "WARN In syncds mode, sleeping for " . $dispersion . "s to see if the update my parents need is cleared.\n";
+ ( $dispersion > 0 ) && &sleep_timer($dispersion);
}
- }
- else {
- ( $log_level >> $DEBUG ) && print "DEBUG Traffic Ops is signaling that my parents do not need an update, or wait_for_parents == 0.\n";
- }
- }
- else {
- if ( $parent_pending == 1 && $wait_for_parents == 1 ) {
- ( $log_level >> $ERROR ) && print "ERROR Traffic Ops is signaling that my parents need an update.\n";
- if ( $script_mode == $SYNCDS ) {
- if ( $dispersion > 0 ) {
- ( $log_level >> $WARN ) && print "WARN In syncds mode, sleeping for " . $dispersion . "s to see if the update my parents need is cleared.\n";
- ( $dispersion > 0 ) && &sleep_timer($dispersion);
- }
- $upd_ref = &lwp_get($uri);
- if ( $upd_ref =~ m/^\d{3}$/ ) {
- ( $log_level >> $ERROR ) && print "ERROR Update URL: $uri returned $upd_ref. Exiting, not sure what else to do.\n";
- exit 1;
- }
- $upd_json = decode_json($upd_ref);
- $parent_pending = ( defined( $upd_json->[0]->{'parent_pending'} ) ) ? $upd_json->[0]->{'parent_pending'} : undef;
- if ( !defined($parent_pending) ) {
- ( $log_level >> $ERROR ) && print "ERROR Invalid JSON for $uri. Exiting, not sure what else to do.\n";
- }
- if ( $parent_pending == 1 || $parent_reval_pending == 1 ) {
- ( $log_level >> $ERROR ) && print "ERROR My parents still need an update, bailing.\n";
- exit 1;
-
- }
- else {
- ( $log_level >> $DEBUG ) && print "DEBUG The update on my parents cleared; continuing.\n";
- }
+ $upd_ref = &lwp_get($uri);
+ if ( $upd_ref =~ m/^\d{3}$/ ) {
+ ( $log_level >> $ERROR ) && print "ERROR Update URL: $uri returned $upd_ref. Exiting, not sure what else to do.\n";
+ exit 1;
+ }
+ $upd_json = decode_json($upd_ref);
+ $parent_pending = ( defined( $upd_json->[0]->{'parent_pending'} ) ) ? $upd_json->[0]->{'parent_pending'} : undef;
+ if ( !defined($parent_pending) ) {
+ ( $log_level >> $ERROR ) && print "ERROR Invalid JSON for $uri. Exiting, not sure what else to do.\n";
+ }
+ if ( $parent_pending == 1 || $parent_reval_pending == 1 ) {
+ ( $log_level >> $ERROR ) && print "ERROR My parents still need an update, bailing.\n";
+ exit 1;
+
+ }
+ else {
+ ( $log_level >> $DEBUG ) && print "DEBUG The update on my parents cleared; continuing.\n";
}
- }
- else {
- ( $log_level >> $DEBUG ) && print "DEBUG Traffic Ops is signaling that my parents do not need an update, or wait_for_parents == 0.\n";
}
+ }
+ else {
+ ( $log_level >> $DEBUG ) && print "DEBUG Traffic Ops is signaling that my parents do not need an update, or wait_for_parents == 0.\n";
}
}
elsif ( $script_mode == $SYNCDS && $upd_pending != 1 ) {
@@ -1770,6 +1735,11 @@ sub get_cfg_file_list {
}
}
else {
+ printf( "INFO Reval in use status: $reval_in_use \n" );
+ if ( $reval_in_use == 1 ) {
+ printf( "INFO Instant Invalidate is in use. Skipping regex_revalidate.config. \n" );
+ delete $ort_ref->{'config_files'}->{'regex_revalidate.config'};
+ }
foreach my $cfg_file ( keys %{ $ort_ref->{'config_files'} } ) {
my $fname_on_disk = &get_filename_on_disk($cfg_file);
( $log_level >> $INFO )
[2/6] incubator-trafficcontrol git commit: make config file list
prettier
Posted by el...@apache.org.
make config file list prettier
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/24fe0560
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/24fe0560
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/24fe0560
Branch: refs/heads/master
Commit: 24fe0560b7b25e1a72003063f1956546d34fd131
Parents: 63c1c78
Author: Derek Gelinas <mr...@gmail.com>
Authored: Fri Mar 31 19:05:45 2017 +0000
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Mon Apr 10 12:42:46 2017 -0600
----------------------------------------------------------------------
traffic_ops/bin/traffic_ops_ort.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/24fe0560/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index 1b1a9cf..9ff6d47 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -1739,7 +1739,7 @@ sub get_cfg_file_list {
( $log_level >> $WARN ) && printf("WARN Instant Invalidate is enabled. Skipping regex_revalidate.config.\n");
delete $ort_ref->{'config_files'}->{'regex_revalidate.config'};
}
- foreach my $cfg_file ( keys %{ $ort_ref->{'config_files'} } ) {
+ foreach my $cfg_file ( sort keys %{ $ort_ref->{'config_files'} } ) {
my $fname_on_disk = &get_filename_on_disk($cfg_file);
( $log_level >> $INFO )
&& printf( "INFO Found config file (on disk: %-41s): %-41s with location: %-50s\n", $fname_on_disk, $cfg_file, $ort_ref->{'config_files'}->{$cfg_file}->{'location'} );