cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From DaanHoogland <...@git.apache.org>
Subject [GitHub] cloudstack pull request: CLOUDSTACK-8677: Call-home functionality ...
Date Tue, 28 Jul 2015 10:27:05 GMT
Github user DaanHoogland commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/625#discussion_r35633526
  
    --- Diff: server/src/org/apache/cloudstack/report/UsageReporter.java ---
    @@ -0,0 +1,487 @@
    +// Licensed to the Apache Software Foundation (ASF) under one
    +// or more contributor license agreements.  See the NOTICE file
    +// distributed with this work for additional information
    +// regarding copyright ownership.  The ASF licenses this file
    +// to you under the Apache License, Version 2.0 (the
    +// "License"); you may not use this file except in compliance
    +// with the License.  You may obtain a copy of the License at
    +//
    +//   http://www.apache.org/licenses/LICENSE-2.0
    +//
    +// Unless required by applicable law or agreed to in writing,
    +// software distributed under the License is distributed on an
    +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    +// KIND, either express or implied.  See the License for the
    +// specific language governing permissions and limitations
    +// under the License.
    +package org.apache.cloudstack.report;
    +
    +import java.util.concurrent.Executors;
    +import java.util.concurrent.ScheduledExecutorService;
    +import java.util.concurrent.TimeUnit;
    +import java.util.ArrayList;
    +import java.util.List;
    +import java.util.Map;
    +import java.util.HashMap;
    +import java.text.DateFormat;
    +import java.text.SimpleDateFormat;
    +import java.sql.Connection;
    +import java.sql.PreparedStatement;
    +import java.sql.ResultSet;
    +import java.sql.SQLException;
    +import java.net.URL;
    +import java.net.SocketTimeoutException;
    +import java.net.MalformedURLException;
    +import java.net.ProtocolException;
    +import java.net.UnknownHostException;
    +import java.io.OutputStreamWriter;
    +import java.io.IOException;
    +
    +import javax.inject.Inject;
    +import javax.net.ssl.HttpsURLConnection;
    +
    +import org.apache.log4j.Logger;
    +import org.springframework.stereotype.Component;
    +
    +import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
    +import org.apache.cloudstack.managed.context.ManagedContextRunnable;
    +
    +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
    +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
    +
    +import org.apache.commons.codec.digest.DigestUtils;
    +
    +import com.cloud.host.HostVO;
    +import com.cloud.host.dao.HostDao;
    +import com.cloud.dc.ClusterVO;
    +import com.cloud.dc.dao.ClusterDao;
    +import com.cloud.dc.DataCenterVO;
    +import com.cloud.dc.dao.DataCenterDao;
    +import com.cloud.vm.UserVmVO;
    +import com.cloud.vm.dao.UserVmDao;
    +import com.cloud.vm.VMInstanceVO;
    +import com.cloud.vm.dao.VMInstanceDao;
    +import com.cloud.utils.db.SearchCriteria;
    +import com.cloud.utils.NumbersUtil;
    +import com.cloud.utils.component.ManagerBase;
    +import com.cloud.utils.component.ComponentMethodInterceptable;
    +import com.cloud.utils.concurrency.NamedThreadFactory;
    +import com.cloud.utils.db.DB;
    +import com.cloud.utils.db.TransactionLegacy;
    +import com.cloud.upgrade.dao.VersionDao;
    +import com.cloud.upgrade.dao.VersionVO;
    +import com.cloud.storage.dao.DiskOfferingDao;
    +import com.cloud.storage.DiskOfferingVO;
    +import com.google.gson.Gson;
    +import com.google.gson.GsonBuilder;
    +import com.google.common.util.concurrent.AtomicLongMap;
    +
    +@Component
    +public class UsageReporter extends ManagerBase implements ComponentMethodInterceptable
{
    +    public static final Logger s_logger = Logger.getLogger(UsageReporter.class.getName());
    +
    +    /* !FIX ME! This should point to a Apache Infra host with SSL! */
    +    private String reportHost = "https://call-home.cloudstack.org/report";
    +
    +    private String uniqueID = null;
    +
    +    private static UsageReporter s_instance = null;
    +
    +    private ScheduledExecutorService _executor = null;
    +
    +    @Inject
    +    private ConfigurationDao _configDao;
    +    @Inject
    +    private HostDao _hostDao;
    +    @Inject
    +    private ClusterDao _clusterDao;
    +    @Inject
    +    private PrimaryDataStoreDao _storagePoolDao;
    +    @Inject
    +    private DataCenterDao _dataCenterDao;
    +    @Inject
    +    private UserVmDao _userVmDao;
    +    @Inject
    +    private VMInstanceDao _vmInstance;
    +    @Inject
    +    private VersionDao _versionDao;
    +    @Inject
    +    private DiskOfferingDao _diskOfferingDao;
    +
    +    int usageReportInterval = -1;
    +
    +    public static UsageReporter getInstance() {
    +        return s_instance;
    +    }
    +
    +    public static UsageReporter getInstance(Map<String, String> configs) {
    +        s_instance.init(configs);
    +        return s_instance;
    +    }
    +
    +    public UsageReporter() {
    +        s_instance = this;
    +    }
    +
    +    @Override
    +    public boolean start() {
    +        init(_configDao.getConfiguration());
    +        return true;
    +    }
    +
    +    private void init(Map<String, String> configs) {
    +        _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("UsageReporter"));
    +
    +        usageReportInterval = NumbersUtil.parseInt(configs.get("usage.report.interval"),
7);
    +
    +        if (usageReportInterval > 0) {
    +            _executor.scheduleWithFixedDelay(new UsageCollector(), 7, usageReportInterval,
TimeUnit.DAYS);
    +        }
    +
    +        uniqueID = getUniqueId();
    +    }
    +
    +    private void sendReport(String reportUri, String uniqueID, Map<String, Object>
reportMap) {
    +
    +        GsonBuilder builder = new GsonBuilder();
    +
    +        AtomicGsonAdapter adapter = new AtomicGsonAdapter();
    +        builder.registerTypeAdapter(AtomicLongMap.class, adapter);
    +
    +        Gson gson = builder.create();
    +        String report = gson.toJson(reportMap);
    +
    +        HttpsURLConnection conn = null;
    +        OutputStreamWriter osw = null;
    +
    +        int http_timeout = 15000;
    +
    +        try {
    +            s_logger.info("Usage Report will be send to: " + reportUri);
    +            s_logger.debug("REPORT: " + report);
    +
    +            URL url = new URL(reportUri + "/" + uniqueID);
    +
    +            conn = (HttpsURLConnection) url.openConnection();
    +            conn.setConnectTimeout(http_timeout);
    +            conn.setReadTimeout(http_timeout);
    +            conn.setRequestMethod("POST");
    +            conn.setDoOutput(true);
    +            conn.setRequestProperty("Content-Type", "application/json");
    +            conn.setRequestProperty("Accept", "application/json");
    +
    +            osw = new OutputStreamWriter(conn.getOutputStream());
    +            osw.write(report);
    +            osw.flush();
    +
    +            int resp_code = conn.getResponseCode();
    +
    +            if (resp_code == HttpsURLConnection.HTTP_OK){
    +                s_logger.info("Usage Report succesfully send to: " + reportUri);
    +            } else {
    +                s_logger.warn("Failed to send Usage Report: " + conn.getResponseMessage());
    +            }
    +
    +        } catch (UnknownHostException e) {
    +            s_logger.warn("Failed to look up Usage Report host: " + e.getMessage());
    +        } catch (SocketTimeoutException e) {
    +            s_logger.warn("Sending Usage Report to " + reportUri + " timed out: " + e.getMessage());
    +        } catch (MalformedURLException e) {
    +            s_logger.warn(reportUri + " is a invalid URL for sending Usage Report to:
"+ e.getMessage());
    +        } catch (ProtocolException e) {
    +            s_logger.warn("Sending Usage Report failed due to a invalid protocol: " +
e.getMessage());
    +        } catch (IOException e) {
    +            s_logger.warn("Failed to write Usage Report due to a IOException: " + e.getMessage());
    +        } finally {
    +            if (osw != null) {
    +                try {
    --- End diff --
    
    I would like to see:
    diff --git a/server/src/org/apache/cloudstack/report/UsageReporter.java b/server/src/org/apache/cloudstack/report/UsageReporter.java
    index 79b5ccf..3854653 100644
    --- a/server/src/org/apache/cloudstack/report/UsageReporter.java
    +++ b/server/src/org/apache/cloudstack/report/UsageReporter.java
    @@ -152,7 +152,6 @@
             String report = gson.toJson(reportMap);
     
             HttpsURLConnection conn = null;
    -        OutputStreamWriter osw = null;
     
             int http_timeout = 15000;
     
    @@ -170,10 +169,10 @@
                 conn.setRequestProperty("Content-Type", "application/json");
                 conn.setRequestProperty("Accept", "application/json");
     
    -            osw = new OutputStreamWriter(conn.getOutputStream());
    -            osw.write(report);
    -            osw.flush();
    -
    +            try (OutputStreamWriter osw = new OutputStreamWriter(conn.getOutputStream(),
com.cloud.utils.StringUtils.getPreferredCharset());) {
    +                osw.write(report);
    +                osw.flush();
    +            }
                 int resp_code = conn.getResponseCode();
     
                 if (resp_code == HttpsURLConnection.HTTP_OK){
    @@ -193,14 +192,6 @@
             } catch (IOException e) {
                 s_logger.warn("Failed to write Usage Report due to a IOException: " + e.getMessage());
             } finally {
    -            if (osw != null) {
    -                try {
    -                    osw.close();
    -                } catch (IOException e) {
    -                    s_logger.debug("Failed to close output stream of HTTPS connection:
" + e.getMessage());
    -                }
    -            }
    -
                 if (conn != null) {
                     conn.disconnect();
                 }


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message