Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Revert "Log Request performance"
This reverts commit 8968df9.
  • Loading branch information
forki committed Oct 19, 2015
commit ecfe4d2241d60b787a364078de3f65e8feec3ea6
5 changes: 2 additions & 3 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#### 2.15.6 - 19.10.2015
#### 2.16.0-alpha001 - 19.10.2015
* Log Request performance

#### 2.15.5 - 19.10.2015
* BUGFIX: Fixed loading of Project files on mono - https://github.com/fsprojects/Paket/pull/1149
* PERFORMANCE: Caching proxy scheme - https://github.com/fsprojects/Paket/pull/1153

#### 2.15.1 - 17.10.2015
* BUGFIX: Fixed framework restriction filter - https://github.com/fsprojects/Paket/pull/1146
Expand Down
16 changes: 3 additions & 13 deletions src/Paket.Core/NuGetV2.fs
Original file line number Diff line number Diff line change
Expand Up @@ -62,57 +62,47 @@ let rec private followODataLink auth url =
}



let tryGetAllVersionsFromNugetODataWithFilter (auth, nugetURL, package:PackageName) =
async {
try
let sw = System.Diagnostics.Stopwatch.StartNew()
let url = sprintf "%s/Packages?$filter=Id eq '%O'" nugetURL package
verbosefn "getAllVersionsFromNugetODataWithFilter from url '%s'" url
let! result = followODataLink auth url
traceVerbose <| sprintf "PERF: ODataWithFilter %O: %dms" package sw.ElapsedMilliseconds
return Some result
with _ -> return None
}

let tryGetPackageVersionsViaOData (auth, nugetURL, package:PackageName) =
async {
try
let sw = System.Diagnostics.Stopwatch.StartNew()
let url = sprintf "%s/FindPackagesById()?id='%O'" nugetURL package
verbosefn "getAllVersionsFromNugetOData from url '%s'" url
let! result = followODataLink auth url
traceVerbose <| sprintf "PERF: OData %O: %dms" package sw.ElapsedMilliseconds
return Some result
with _ -> return None
}

let tryGetPackageVersionsViaJson (auth, nugetURL, package:PackageName) =
async {
let sw = System.Diagnostics.Stopwatch.StartNew()
let url = sprintf "%s/package-versions/%O?includePrerelease=true" nugetURL package
let! raw = safeGetFromUrl (auth, url, acceptJson)

match raw with
| None -> return None
| Some data ->
try
traceVerbose <| sprintf "PERF: json %O: %dms" package sw.ElapsedMilliseconds
return Some(JsonConvert.DeserializeObject<string []> data)
with _ -> return None
}

let tryNuGetV3 (auth, nugetV3Url, package:PackageName) =
async {
try
let sw = System.Diagnostics.Stopwatch.StartNew()
async {
try
let! data = NuGetV3.findVersionsForPackage(nugetV3Url, auth, package, true, 100000)
match data with
| Some data when Array.isEmpty data -> return None
| None -> return None
| _ ->
traceVerbose <| sprintf "PERF: V3 %O: %dms" package sw.ElapsedMilliseconds
return data
| _ -> return data
with exn -> return None
}

Expand Down
2 changes: 0 additions & 2 deletions src/Paket.Core/Utils.fs
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,8 @@ let safeGetFromUrl (auth:Auth option, url : string, contentType : string) =
if notNullOrEmpty contentType then
client.Headers.Add(HttpRequestHeader.Accept, contentType)

let sw2 = System.Diagnostics.Stopwatch.StartNew()
let s = client.DownloadStringTaskAsync(uri) |> Async.AwaitTask
let! raw = s
traceVerbose <| sprintf " - download was %dms" sw2.ElapsedMilliseconds
return Some raw
with _ -> return None
}
Expand Down