Skip to content

Instantly share code, notes, and snippets.

@neoeinstein
neoeinstein / LogentriesSink.fs
Created October 23, 2015 03:26
My in-progress attempt at creating a sink for serilog to logentries, which I halted after finding the JSON formatter.
module Logentries =
open System.IO
open System.Net.Sockets
open System.Net.Security
type Connection =
private
{ Client : TcpClient
Stream : Stream }
interface System.IDisposable with
// FastPrintf - a fast F# printf replacement
// Copyright (C) 2011-2012, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
// Report bugs and download new versions at http://hg.zeuxcg.org/fastprintf
// This library is distributed under the MIT License.
[<AutoOpen>]
module FastPrintf
// Configuration defines:
// FASTPRINTF_COMPAT_FS2 - enables F# 2.0 compatibility (no padding for %c)
// FASTPRINTF_COMPAT_FX3 - enables .NET 3.x compatibility (no ConcurrentDictionary)
C:\dev\neoeinstein\FAKE\packages\FSharp.Formatting.CommandTool\tools\fsformatting.exe "metadataformat" "--generate" "--outdir" "./docs/apidocs/" "--layoutroots" "./help/templates/" "./help/templates/reference/" "--sourceRepo" "https://github.com/fsharp/FAKE/blob/master" "--sourceFolder" "C:\dev\neoeinstein\FAKE" "--parameters" "page-description" "FAKE - F# Make" "page-author" "Steffen Forkmann, Mauricio Scheffer, Colin Bull" "project-author" "Steffen Forkmann, Mauricio Scheffer, Colin Bull" "github-link" "https://github.com/fsharp/FAKE" "project-github" "http://github.com/fsharp/fake" "project-nuget" "https://www.nuget.org/packages/FAKE" "root" "http://fsharp.github.io/FAKE" "project-name" "FAKE - F# Make" --dllfiles "C:\dev\neoeinstein\FAKE\build\FakeLib.dll"
[0 sec] Resolving assembly: FSharp.Compiler.Service.resources, Version=0.0.82.0, Culture=en-US, PublicKeyToken=null
[0 sec] Resolving assembly: FSharp.Compiler.Service.resources, Version=0.0.82.0, Culture=en-US, PublicKeyToken=null
[0 sec] Resolving ass
<?xml version="1.0" encoding="utf-8"?>
<!--
Converts the MSpec (http://github.com/machine/machine.specifications) xml
output to JUnit output format.
The aim of this transformation is to integrate MSpec tests to Jenkins CI.
Jenkins understands test results presented in JUnit format.
-->
@neoeinstein
neoeinstein / Abort-AwsGlacierMultipartUpload.ps1
Created August 23, 2012 15:19
Powershell script to upload an archive to AWS Glacier with multipart retry and resume
<#
.SYNOPSIS
Aborts a multipart upload to an Amazon Web Services Glacier vault.
.DESCRIPTION
Abort-AwsGlacierUpload aborts a multipart upload to an AWS Glacier vault. After an upload is successfully aborted no further parts may be uploaded for that upload request.
.PARAMETER VaultName
Name of the Glacier vault in which the upload was initiated.
Important Links:
SNMP RFCs:
2578: Structure of Management Information Version 2 (SMIv2)
http://tools.ietf.org/html/rfc2578
2579: Textual Conventions for SMIv2
http://tools.ietf.org/html/rfc2579
2580: Conformance Statements for SMIv2
http://tools.ietf.org/html/rfc2580
SNMP MIB Example:
## These directives are to help preserve anonymity while allowing for aggregation of data
## Only use this if you are proactively shredding log files
## If doing running statistical analysis that depends on timestamps
#LogFormat "%{Service}e:%p %l %{GEOIP_COUNTRY_NAME}e %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" anonymous
## For general use
LogFormat "%{Service}e:%p %l %{GEOIP_COUNTRY_NAME}e %{[%d/%b/%Y:%H:00:00 %z]}t \"%r\" %>s %B \"%{Referer}i\" \"%{User-Agent}i\"" anonymous
SetEnv Service Normal
SetEnvIfNoCase Host ".onion$" Service=Hidden GEOIP_COUNTRY_CODE=HS GEOIP_COUNTRY_NAME=Hidden
diff --git a/doc/Howto-thandy.txt b/doc/Howto-thandy.txt
index 98ee4ee..f542ca5 100644
--- a/doc/Howto-thandy.txt
+++ b/doc/Howto-thandy.txt
@@ -234,6 +234,15 @@ history, and the head of the 'master' branch now just point
s at them.
If there are changes, git will try to merge for you.
+`git pull` is essentially just `git fetch` followed by `git merge`. If you