Skip to content
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

Jump to bottom

Changes to get windows build working #713

Merged
merged 3 commits into from
Jan 8, 2017
Merged

Changes to get windows build working #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71f3cf4
Use std namespace for string.
mstemm Jan 8, 2017
132898b
Add header file for shared_ptr.
mstemm Jan 8, 2017
6af4bfa
Only implement marathon_uris with HAS_CAPTURE
mstemm Jan 8, 2017
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
2 changes: 2 additions & 0 deletions userspace/libsinsp/mesos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,12 @@ void mesos::refresh_token()
#endif // HAS_CAPTURE
}

#ifdef HAS_CAPTURE
const mesos::uri_list_t &mesos::marathon_uris()
{
return (m_discover_marathon_uris ? m_state_http->get_marathon_uris() : m_marathon_uris);
}
#endif

void mesos::refresh()
{
Expand Down
2 changes: 1 addition & 1 deletion userspace/libsinsp/mesos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ class mesos : public mesos_auth
bool collect_data();
virtual void refresh_token();

#ifdef HAS_CAPTURE
const uri_list_t &marathon_uris();

#ifdef HAS_CAPTURE
void send_data_request(bool collect = true);

const mesos_state_t::capture_list& get_capture_events() const;
Expand Down
2 changes: 2 additions & 0 deletions userspace/libsinsp/mesos_auth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ along with sysdig. If not, see <http://www.gnu.org/licenses/>.

#include "mesos_auth.h"

using namespace std;

mesos_auth::mesos_auth(const uri::credentials_t& dcos_enterprise_credentials,
string auth_hostname,
int token_refresh_interval)
Expand Down
6 changes: 3 additions & 3 deletions userspace/libsinsp/mesos_auth.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class mesos_auth
{
public:
mesos_auth(const uri::credentials_t& dcos_enterprise_credentials = uri::credentials_t(),
string auth_hostname = "localhost",
std::string auth_hostname = "localhost",
int token_refresh_interval = DCOS_ENTERPRISE_TOKEN_REFRESH_S);
virtual ~mesos_auth();

Expand All @@ -42,10 +42,10 @@ class mesos_auth
// after the token has been returned, so it's best to call
// get_token periodically, which will internally refresh the
// token if necessary.
string get_token();
std::string get_token();

protected:
string m_token;
std::string m_token;

private:
void authenticate();
Expand Down
1 change: 1 addition & 0 deletions userspace/libsinsp/mesos_http.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ inline const mesos_http::marathon_uri_t& mesos_http::get_marathon_uris() const
#else // !HAS_CAPTURE

#include "json/json.h"
#include <memory>

class mesos_http
{
Expand Down