You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/03/28 15:18:52 UTC

[3/3] incubator-trafficcontrol git commit: intial changes

intial changes


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/dfa58b84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/dfa58b84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/dfa58b84

Branch: refs/heads/master
Commit: dfa58b8446b068ff6551a88cab358b310d8ec1ce
Parents: 8436065
Author: Derek Gelinas <mr...@gmail.com>
Authored: Mon Mar 27 20:49:29 2017 +0000
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue Mar 28 09:18:32 2017 -0600

----------------------------------------------------------------------
 traffic_ops/bin/traffic_ops_ort.pl | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dfa58b84/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 180f321..f82c8ae 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -36,12 +36,14 @@ my %supported_el_release = ( "EL6" => 1, "EL7" => 1);
 my $dispersion = 300;
 my $retries = 5;
 my $wait_for_parents = 1;
+my $login_dispersion = 0;
 my $reval_wait_time = 60;
 my $reval_in_use = 0;
 
 GetOptions( "dispersion=i"       => \$dispersion, # dispersion (in seconds)
             "retries=i"          => \$retries,
-            "wait_for_parents=i" => \$wait_for_parents );
+            "wait_for_parents=i" => \$wait_for_parents,
+            "login_dispersion=i" => \$login_dispersion );
 
 if ( $#ARGV < 1 ) {
 	&usage();
@@ -317,9 +319,10 @@ sub usage {
 	print "\n";
 	print "\t<Traffic_Ops_Login> => Example: 'username:password' \n";
 	print "\n\t[optional flags]:\n";
-	print "\t\tdispersion=<time>      => wait a random number between 0 and <time> before starting. Default = 300.\n";
-	print "\t\tretries=<number>       => retry connection to Traffic Ops URL <number> times. Default = 3.\n";
-	print "\t\twait_for_parents=<0|1> => do not update if parent_pending = 1 in the update json. Default = 1, wait for parents.\n";
+	print "\t   dispersion=<time>\t=> wait a random number between 0 and <time> before starting. Default = 300.\n";
+	print "\t   login_dispersion=<time>\t=> wait a random number between 0 and <time> before login. Default = 0.\n";
+	print "\t   retries=<number>\t=> retry connection to Traffic Ops URL <number> times. Default = 3.\n";
+	print "\t   wait_for_parents=<0|1>\t=> do not update if parent_pending = 1 in the update json. Default = 1, wait for parents.\n";
 	print "====-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-====\n";
 	exit 1;
 }
@@ -1552,6 +1555,12 @@ sub get_cookie {
 	my $to_login    = shift;
 	my ( $u, $p ) = split( /:/, $to_login );
 	my %headers;
+
+	if ( $login_dispersion > 0 ) {
+		( $log_level >> $WARN ) && print "WARN Login dispersion is enabled.\n";
+		&sleep_rand($login_dispersion);
+	}
+
 	my $url = $to_host . "/login";
 	my $response = $lwp_conn->post( $url, [ 'u' => $u, 'p' => $p ], %headers );