Skip to content

Refactor to trapperkeeper#780

Merged
senior merged 12 commits intopuppetlabs:masterfrom
cprice404:feature/master/pe2015-refactor-to-trapperkeeper
Jan 8, 2014
Merged

Refactor to trapperkeeper#780
senior merged 12 commits intopuppetlabs:masterfrom
cprice404:feature/master/pe2015-refactor-to-trapperkeeper

Conversation

@cprice404
Copy link

This PR is a replacement for #773. It is rebased onto the latest PuppetDB master branch, updated to use released versions of trapperkeeper and kitchensink, and addresses all of the comments that were made on that PR.

@puppetlabs-jenkins
Copy link
Contributor

💚 Test passed.
Refer to this link for build results: https://jenkins.puppetlabs.com/job/PuppetDB%20Acceptance%20-%20Pull%20Requests/111/

@puppetcla
Copy link

CLA signed by all contributors.

project.clj Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be bumped to 0.1.0 release of trapperkeeper?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agh! good catch. I got the ones in the normal dependencies section but I always forget the test ones :(

@senior
Copy link
Contributor

senior commented Dec 30, 2013

Other than the two minor things I pointed out, looks good! I like the namespaced keywords for the error types.

@cprice404
Copy link
Author

SNAPSHOT test dependency is fixed. Will wait to hear response on the github docs link before making any changes there.

@puppetlabs-jenkins
Copy link
Contributor

💚 Test passed.
Refer to this link for build results: https://jenkins.puppetlabs.com/job/PuppetDB%20Acceptance%20-%20Pull%20Requests/112/

@puppetlabs-jenkins
Copy link
Contributor

💚 Test passed.
Refer to this link for build results: https://jenkins.puppetlabs.com/job/PuppetDB%20Acceptance%20-%20Pull%20Requests/113/

cprice404 and others added 12 commits January 8, 2014 10:51
Conflicts:

	project.clj
	src/com/puppetlabs/puppetdb/cli/services.clj
	src/com/puppetlabs/puppetdb/config.clj
	test/com/puppetlabs/puppetdb/fixtures.clj
	test/com/puppetlabs/puppetdb/test/config.clj
This commit does the following:

* Introduces a `context` atom in services.clj, whose value is a
  map used to keep references to the various stateful bits of
  the PuppetDB subsystems.  This is something that has been
  discussed previously as a means for potentially allowing more
  interactive development in the REPL, and for doing things
  like dynamically reloading subsystems when configuration
  changes occur.  In this commit, it's used to provide a way
  to shutdown those subsystems when a fatal error occurs.

* Adds the new `error-shutdown!` function, which is responsible
  for shutting down threads and subsystems from the `context`
  when a fatal error has occurred.
By default, leinengen doesn't allow SNAPSHOT dependencies when
running `uberjar` on a project that is not also a SNAPSHOT.
Because of the way that we handle the project version in the
PuppetDB project.clj file, PuppetDB is *never* in a SNAPSHOT
state.

This commit adds an environment variable that will cause
leinengen to allow SNAPSHOT deps, but only when running
acceptance tests FROM SOURCE.  Packaging jobs should still
fail if this kind of scenario is encountered for now.
This commit does the following:
* Update to a released version of trapperkeper
* Update to a released version of kitchensink
* Change cli error handling to use new namespaced keywords
Web server configuration is now handled by trapperkeeper.

Conflicts:

	src/com/puppetlabs/puppetdb/config.clj
@cprice404
Copy link
Author

@kbarber @grimradical @senior OK, this is rebased.

@puppetlabs-jenkins
Copy link
Contributor

🔴 Test failed.
Refer to this link for build results: https://jenkins.puppetlabs.com/job/PuppetDB%20Acceptance%20-%20Pull%20Requests/128/

@puppetlabs-jenkins
Copy link
Contributor

🔴 Test failed.
Refer to this link for build results: https://jenkins.puppetlabs.com/job/PuppetDB%20Acceptance%20-%20Pull%20Requests/129/

@grimradical
Copy link
Member

@puppetlabs-jenkins retest this please

@puppetlabs-jenkins
Copy link
Contributor

💚 Test passed.
Refer to this link for build results: https://jenkins.puppetlabs.com/job/PuppetDB%20Acceptance%20-%20Pull%20Requests/130/

senior added a commit that referenced this pull request Jan 8, 2014
…-to-trapperkeeper

Refactor to trapperkeeper
@senior senior merged commit 9b8bc1d into puppetlabs:master Jan 8, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants