Navigation

Changeset 939

Timestamp:

10/16/07 17:27:55 (1 year ago)

Author:

kindlund

Message:

Improved VM destroy logic.

Files:

r926	r939
38	38	my $driver = undef;
39	39	my $config = undef;
40		my $maxrel = -1;
	40	my $maxrel = undef;
41	41	my $nexturl = "";
42	42	my $urllist= "";
…	…
53	53	$driver = getVar(name => "default_driver",
54	54	namespace => "HoneyClient::Agent");
	55	}
	56
	57	# Sanity Check. Make sure $max_relative_links is set.
	58	unless (defined($maxrel)) {
	59	$maxrel = getVar(name => "max_relative_links_to_visit",
	60	namespace => "HoneyClient::Agent::Driver::Browser");
55	61	}
56	62

r933	r939
102	102	</process_name>
103	103	<max_relative_links_to_visit description="An integer, representing the maximum number of relative links that the browser should visit, before moving onto another website. If negative, then the browser will exhaust all possible relative links found, before moving on. This functionality is best effort; it's possible for the browser to visit new links on previously visited websites." default="-1">
104		-1
	104	5
105	105	</max_relative_links_to_visit>
106	106	<positive_words description="If a link contains any number of these words, then its probability of being visited (its score) will increase.">

r926	r939
809	809	for (my $counter = 1;; $counter++) {
810	810
	811	# XXX: This isn't a valid assumption!
811	812	# From this point on, catch all errors generated and
812	813	# assume that the Agent's watchdog process will recover.

r817	r939
815	815	if (defined($DAEMON_PID) && $DAEMON_PID) {
816	816	$ret = kill("QUIT", $DAEMON_PID);
	817
	818	# If the process doesn't respond to 'QUIT', then
	819	# try 'KILL'.
	820	if (kill("QUIT", $DAEMON_PID)) {
	821	kill("KILL", $DAEMON_PID);
	822	}
817	823	}
818	824	if ($ret) {