diff --git a/lib/torque/provider/filterableJson.js b/lib/torque/provider/filterableJson.js index 77edf2f..8b99d4a 100644 --- a/lib/torque/provider/filterableJson.js +++ b/lib/torque/provider/filterableJson.js @@ -325,20 +325,7 @@ var Profiler = require('../profiler'); url: function(subhost) { var opts = this.options; - var protocol = opts.sql_api_protocol || 'http'; - if (!this.options.cdn_url) { - return this._host(); - } - var h = protocol+ "://"; - if (subhost) { - h += subhost + "."; - } - var cdn_host = opts.cdn_url; - if(!cdn_host.http && !cdn_host.https) { - throw new Error("cdn_host should contain http and/or https entries"); - } - h += cdn_host[protocol] + "/" + (opts.user_name || opts.user) + '/api/v2/sql'; - return h; + return opts.sql_api_template.replace('{user}', (opts.user_name || opts.user)).replace('{s}', subhost) + "/api/v1/sql"; }, _hash: function(str) { @@ -371,18 +358,8 @@ var Profiler = require('../profiler'); // execute actual query sql: function(sql, callback, options) { options = options || {}; - var subdomains = this.options.subdomains || '0123'; - if(this.isHttps()) { - subdomains = [null]; // no subdomain - } - - - var url; - if (options.no_cdn) { - url = this._host(); - } else { - url = this.url(subdomains[Math.abs(this._hash(sql))%subdomains.length]); - } + var subdomains = this.options.subdomains || 'abcd'; + url = this.url(subdomains[Math.abs(this._hash(sql))%subdomains.length]); var extra = this._extraParams(); torque.net.get( url + "?q=" + encodeURIComponent(sql) + (extra ? "&" + extra: ''), function (data) { if(options.parseJSON) {